Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c (modified) (11 diffs)
• IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c (modified) (5 diffs)
• IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c (modified) (13 diffs)
• IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf (modified) (4 diffs)
• IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c (modified) (25 diffs)
• IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf (modified) (4 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h (modified) (2 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h (modified) (4 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h (modified) (3 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h (modified) (2 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperMultiPhaseProcessLib.h (added)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h (modified) (4 diffs)
• IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformMultiPhaseLib.h (added)
• IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h (modified) (2 diffs)
• IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h (modified) (1 diff)
• IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml (added)
• IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec (modified) (7 diffs)
• IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc (modified) (3 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c (modified) (9 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c (modified) (13 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c (modified) (4 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/DispatchExecute.c (modified) (7 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/Thunk64To32.nasm (modified) (1 prop)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c (modified) (3 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c (modified) (5 diffs)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull (added)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull/BaseFspWrapperPlatformMultiPhaseLibNull.inf (added)
• IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull/FspWrapperPlatformMultiPhaseLibNull.c (added)
• IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib (added)
• IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib/FspWrapperMultiPhaseProcessLib.inf (added)
• IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib/PeiFspWrapperMultiPhaseProcessLib.c (added)
• IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/FspWrapperApiTest.c (modified) (4 diffs)
• IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c (modified) (20 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Fsp.h (added)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c (modified) (3 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Fsp.h (deleted)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/PeiCoreEntry.nasm (modified) (1 prop)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/SecEntry.nasm (modified) (1 prop)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Stack.nasm (modified) (4 diffs, 1 prop)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c (modified) (2 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf (modified) (3 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c (modified) (2 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c (modified) (3 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c (modified) (5 diffs)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c (modified) (1 diff)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64 (added)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/PeiCoreEntry.nasm (added)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/SecEntry.nasm (added)
• IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/Stack.nasm (added)

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c

@@ -22 +22 @@
 #include <FspStatusCode.h>
 
-#define   FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION     BIT16
+#define   FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION  BIT16
 
 typedef
 EFI_STATUS
-(EFIAPI * ADD_PERFORMANCE_RECORDS)(
+(EFIAPI *ADD_PERFORMANCE_RECORDS)(
   IN CONST VOID *HobStart
   );
 
 struct _ADD_PERFORMANCE_RECORD_PROTOCOL {
-  ADD_PERFORMANCE_RECORDS          AddPerformanceRecords;
+  ADD_PERFORMANCE_RECORDS    AddPerformanceRecords;
 };
 
 typedef struct _ADD_PERFORMANCE_RECORD_PROTOCOL ADD_PERFORMANCE_RECORD_PROTOCOL;
 
-extern EFI_GUID gAddPerfRecordProtocolGuid;
-extern EFI_GUID gFspHobGuid;
-extern EFI_GUID gFspApiPerformanceGuid;
-
-static EFI_EVENT mExitBootServicesEvent     = NULL;
+extern EFI_GUID  gAddPerfRecordProtocolGuid;
+extern EFI_GUID  gFspHobGuid;
+extern EFI_GUID  gFspApiPerformanceGuid;
+
+static EFI_EVENT  mExitBootServicesEvent = NULL;
 
 /**
@@ -54 +54 @@
 EFI_STATUS
 RelocateImageUnder4GIfNeeded (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
   );
 
@@ -71 +71 @@
   )
 {
-  NOTIFY_PHASE_PARAMS NotifyPhaseParams;
-  EFI_STATUS          Status;
-  VOID                *Interface;
+  NOTIFY_PHASE_PARAMS  NotifyPhaseParams;
+  EFI_STATUS           Status;
+  VOID                 *Interface;
 
   //
@@ -85 +85 @@
                   );
   if (EFI_ERROR (Status)) {
-    return ;
+    return;
   }
 
   NotifyPhaseParams.Phase = EnumInitPhaseAfterPciEnumeration;
-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
   Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
 
   //
@@ -97 +97 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
   if (Status != EFI_SUCCESS) {
-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase AfterPciEnumeration failed, status: 0x%x\n", Status));
-  } else {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration Success.\n"));
+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase AfterPciEnumeration failed, status: 0x%x\n", Status));
+  } else {
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration Success.\n"));
   }
 }
@@ -126 +126 @@
   )
 {
-  NOTIFY_PHASE_PARAMS               NotifyPhaseParams;
-  EFI_STATUS                        Status;
+  NOTIFY_PHASE_PARAMS  NotifyPhaseParams;
+  EFI_STATUS           Status;
 
   gBS->CloseEvent (Event);
 
   NotifyPhaseParams.Phase = EnumInitPhaseReadyToBoot;
-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
   Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
 
   //
@@ -140 +140 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
   if (Status != EFI_SUCCESS) {
-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase ReadyToBoot failed, status: 0x%x\n", Status));
-  } else {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot Success.\n"));
+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase ReadyToBoot failed, status: 0x%x\n", Status));
+  } else {
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot Success.\n"));
   }
 }
@@ -167 +167 @@
   )
 {
-  NOTIFY_PHASE_PARAMS               NotifyPhaseParams;
-  EFI_STATUS                        Status;
-  ADD_PERFORMANCE_RECORD_PROTOCOL   *AddPerfRecordInterface;
-  EFI_PEI_HOB_POINTERS              Hob;
-  VOID                              **FspHobListPtr;
+  NOTIFY_PHASE_PARAMS              NotifyPhaseParams;
+  EFI_STATUS                       Status;
+  ADD_PERFORMANCE_RECORD_PROTOCOL  *AddPerfRecordInterface;
+  EFI_PEI_HOB_POINTERS             Hob;
+  VOID                             **FspHobListPtr;
 
   gBS->CloseEvent (Event);
 
   NotifyPhaseParams.Phase = EnumInitPhaseEndOfFirmware;
-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
   Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
 
   //
@@ -184 +184 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
   if (Status != EFI_SUCCESS) {
-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase EndOfFirmware failed, status: 0x%x\n", Status));
-  } else {
-    DEBUG((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware Success.\n"));
-  }
+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase EndOfFirmware failed, status: 0x%x\n", Status));
+  } else {
+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware Success.\n"));
+  }
+
   Status = gBS->LocateProtocol (
                   &gAddPerfRecordProtocolGuid,
                   NULL,
-                  (VOID**) &AddPerfRecordInterface
+                  (VOID **)&AddPerfRecordInterface
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n"));
+    DEBUG ((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n"));
     return;
   } else {
@@ -225 +226 @@
 EFIAPI
 FspWrapperNotifyDxeEntryPoint (
-  IN EFI_HANDLE         ImageHandle,
-  IN EFI_SYSTEM_TABLE   *SystemTable
-  )
-{
-  EFI_STATUS Status;
-  EFI_EVENT  ReadyToBootEvent;
-  VOID       *Registration;
-  EFI_EVENT  ProtocolNotifyEvent;
-  UINT32     FspApiMask;
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  EFI_STATUS  Status;
+  EFI_EVENT   ReadyToBootEvent;
+  VOID        *Registration;
+  EFI_EVENT   ProtocolNotifyEvent;
+  UINT32      FspApiMask;
 
   //
@@ -275 +276 @@
   return EFI_SUCCESS;
 }
-

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c

@@ -30 +30 @@
 EFI_STATUS
 RelocateImageUnder4GIfNeeded (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
-  EFI_STATUS                                    Status;
-  UINT8                                         *Buffer;
-  UINTN                                         BufferSize;
-  EFI_HANDLE                                    NewImageHandle;
-  UINTN                                         Pages;
-  EFI_PHYSICAL_ADDRESS                          FfsBuffer;
-  PE_COFF_LOADER_IMAGE_CONTEXT                  ImageContext;
-  VOID                                          *Interface;
+  EFI_STATUS                    Status;
+  UINT8                         *Buffer;
+  UINTN                         BufferSize;
+  EFI_HANDLE                    NewImageHandle;
+  UINTN                         Pages;
+  EFI_PHYSICAL_ADDRESS          FfsBuffer;
+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;
+  VOID                          *Interface;
 
   //
@@ -65 +65 @@
   //
   NewImageHandle = NULL;
-  Status = gBS->InstallProtocolInterface (
-                  &NewImageHandle,
-                  &gEfiCallerIdGuid,
-                  EFI_NATIVE_INTERFACE,
-                  NULL
-                  );
+  Status         = gBS->InstallProtocolInterface (
+                          &NewImageHandle,
+                          &gEfiCallerIdGuid,
+                          EFI_NATIVE_INTERFACE,
+                          NULL
+                          );
   ASSERT_EFI_ERROR (Status);
 
@@ -76 +76 @@
   // Reload image itself to <4G mem
   //
-  Status = GetSectionFromAnyFv  (
+  Status = GetSectionFromAnyFv (
              &gEfiCallerIdGuid,
              EFI_SECTION_PE32,
              0,
-             (VOID **) &Buffer,
+             (VOID **)&Buffer,
              &BufferSize
              );
@@ -92 +92 @@
   ASSERT_EFI_ERROR (Status);
   if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {
-    Pages = EFI_SIZE_TO_PAGES ((UINTN) (ImageContext.ImageSize + ImageContext.SectionAlignment));
+    Pages = EFI_SIZE_TO_PAGES ((UINTN)(ImageContext.ImageSize + ImageContext.SectionAlignment));
   } else {
-    Pages = EFI_SIZE_TO_PAGES ((UINTN) ImageContext.ImageSize);
+    Pages = EFI_SIZE_TO_PAGES ((UINTN)ImageContext.ImageSize);
   }
+
   FfsBuffer = 0xFFFFFFFF;
-  Status = gBS->AllocatePages (
-                  AllocateMaxAddress,
-                  EfiBootServicesCode,
-                  Pages,
-                  &FfsBuffer
-                  );
+  Status    = gBS->AllocatePages (
+                     AllocateMaxAddress,
+                     EfiBootServicesCode,
+                     Pages,
+                     &FfsBuffer
+                     );
   ASSERT_EFI_ERROR (Status);
   ImageContext.ImageAddress = (PHYSICAL_ADDRESS)(UINTN)FfsBuffer;
@@ -133 +134 @@
 
   DEBUG ((DEBUG_INFO, "Loading driver at 0x%08x EntryPoint=0x%08x\n", (UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.EntryPoint));
-  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint)) (NewImageHandle, gST);
+  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint))(NewImageHandle, gST);
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "Error: Image at 0x%08x start failed: %r\n", ImageContext.ImageAddress, Status));

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c

@@ -4 +4 @@
   notify to call FspSiliconInit API.
 
-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
-
 
 #include <PiPei.h>
@@ -25 +24 @@
 #include <Library/FspWrapperPlatformLib.h>
 #include <Library/FspWrapperHobProcessLib.h>
+#include <Library/FspWrapperMultiPhaseProcessLib.h>
 #include <Library/FspWrapperApiLib.h>
 #include <Library/FspMeasurementLib.h>
@@ -37 +37 @@
 #include <FspEas.h>
 #include <FspStatusCode.h>
-
-extern EFI_GUID gFspHobGuid;
+#include <FspGlobalData.h>
+#include <Library/FspCommonLib.h>
+
+extern EFI_GUID  gFspHobGuid;
+
+/**
+  Get the FSP M UPD Data address
+
+  @return FSP-M UPD Data Address
+**/
+UINTN
+GetFspmUpdDataAddress (
+  VOID
+  )
+{
+  if (PcdGet64 (PcdFspmUpdDataAddress64) != 0) {
+    return (UINTN)PcdGet64 (PcdFspmUpdDataAddress64);
+  } else {
+    return (UINTN)PcdGet32 (PcdFspmUpdDataAddress);
+  }
+}
 
 /**
@@ -50 +69 @@
   )
 {
-  FSP_INFO_HEADER           *FspmHeaderPtr;
-  EFI_STATUS                Status;
-  UINT64                    TimeStampCounterStart;
-  VOID                      *FspHobListPtr;
-  VOID                      *HobData;
-  FSPM_UPD_COMMON           *FspmUpdDataPtr;
-  UINTN                     *SourceData;
+  FSP_INFO_HEADER  *FspmHeaderPtr;
+  EFI_STATUS       Status;
+  UINT64           TimeStampCounterStart;
+  VOID             *FspHobListPtr;
+  VOID             *HobData;
+  VOID             *FspmUpdDataPtr;
+  UINTN            *SourceData;
 
   DEBUG ((DEBUG_INFO, "PeiFspMemoryInit enter\n"));
 
-  FspHobListPtr = NULL;
+  FspHobListPtr  = NULL;
   FspmUpdDataPtr = NULL;
 
-  FspmHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
+  FspmHeaderPtr = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
   DEBUG ((DEBUG_INFO, "FspmHeaderPtr - 0x%x\n", FspmHeaderPtr));
   if (FspmHeaderPtr == NULL) {
@@ -69 +88 @@
   }
 
-  if (PcdGet32 (PcdFspmUpdDataAddress) == 0 && (FspmHeaderPtr->CfgRegionSize != 0) && (FspmHeaderPtr->CfgRegionOffset != 0)) {
+  if ((GetFspmUpdDataAddress () == 0) && (FspmHeaderPtr->CfgRegionSize != 0) && (FspmHeaderPtr->CfgRegionOffset != 0)) {
     //
     // Copy default FSP-M UPD data from Flash
     //
-    FspmUpdDataPtr = (FSPM_UPD_COMMON *)AllocateZeroPool ((UINTN)FspmHeaderPtr->CfgRegionSize);
+    FspmUpdDataPtr = AllocateZeroPool ((UINTN)FspmHeaderPtr->CfgRegionSize);
     ASSERT (FspmUpdDataPtr != NULL);
     SourceData = (UINTN *)((UINTN)FspmHeaderPtr->ImageBase + (UINTN)FspmHeaderPtr->CfgRegionOffset);
@@ -81 +100 @@
     // External UPD is ready, get the buffer from PCD pointer.
     //
-    FspmUpdDataPtr = (FSPM_UPD_COMMON *)PcdGet32 (PcdFspmUpdDataAddress);
+    FspmUpdDataPtr = (VOID *)GetFspmUpdDataAddress ();
     ASSERT (FspmUpdDataPtr != NULL);
   }
 
   DEBUG ((DEBUG_INFO, "UpdateFspmUpdData enter\n"));
-  UpdateFspmUpdData ((VOID *)FspmUpdDataPtr);
-  DEBUG ((DEBUG_INFO, "  NvsBufferPtr        - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.NvsBufferPtr));
-  DEBUG ((DEBUG_INFO, "  StackBase           - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.StackBase));
-  DEBUG ((DEBUG_INFO, "  StackSize           - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.StackSize));
-  DEBUG ((DEBUG_INFO, "  BootLoaderTolumSize - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.BootLoaderTolumSize));
-  DEBUG ((DEBUG_INFO, "  BootMode            - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.BootMode));
+  UpdateFspmUpdData (FspmUpdDataPtr);
+  if (((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.Revision >= 3) {
+    DEBUG ((DEBUG_INFO, "  StackBase           - 0x%lx\n", ((FSPM_UPD_COMMON_FSP24 *)FspmUpdDataPtr)->FspmArchUpd.StackBase));
+    DEBUG ((DEBUG_INFO, "  StackSize           - 0x%lx\n", ((FSPM_UPD_COMMON_FSP24 *)FspmUpdDataPtr)->FspmArchUpd.StackSize));
+    DEBUG ((DEBUG_INFO, "  BootLoaderTolumSize - 0x%x\n", ((FSPM_UPD_COMMON_FSP24 *)FspmUpdDataPtr)->FspmArchUpd.BootLoaderTolumSize));
+    DEBUG ((DEBUG_INFO, "  BootMode            - 0x%x\n", ((FSPM_UPD_COMMON_FSP24 *)FspmUpdDataPtr)->FspmArchUpd.BootMode));
+  } else {
+    DEBUG ((DEBUG_INFO, "  NvsBufferPtr        - 0x%x\n", ((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.NvsBufferPtr));
+    DEBUG ((DEBUG_INFO, "  StackBase           - 0x%x\n", ((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.StackBase));
+    DEBUG ((DEBUG_INFO, "  StackSize           - 0x%x\n", ((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.StackSize));
+    DEBUG ((DEBUG_INFO, "  BootLoaderTolumSize - 0x%x\n", ((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.BootLoaderTolumSize));
+    DEBUG ((DEBUG_INFO, "  BootMode            - 0x%x\n", ((FSPM_UPD_COMMON *)FspmUpdDataPtr)->FspmArchUpd.BootMode));
+  }
+
   DEBUG ((DEBUG_INFO, "  HobListPtr          - 0x%x\n", &FspHobListPtr));
 
   TimeStampCounterStart = AsmReadTsc ();
-  Status = CallFspMemoryInit (FspmUpdDataPtr, &FspHobListPtr);
+  Status                = CallFspMemoryInit (FspmUpdDataPtr, &FspHobListPtr);
+
+  //
+  // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status
+  //
+  if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
+    DEBUG ((DEBUG_INFO, "FspMemoryInitApi requested reset %r\n", Status));
+    CallFspWrapperResetSystem (Status);
+  }
+
+  if ((Status != FSP_STATUS_VARIABLE_REQUEST) && EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "ERROR - Failed to execute FspMemoryInitApi(), Status = %r\n", Status));
+    ASSERT_EFI_ERROR (Status);
+  }
+
+  DEBUG ((DEBUG_INFO, "FspMemoryInit status: %r\n", Status));
+  if (Status == FSP_STATUS_VARIABLE_REQUEST) {
+    //
+    // call to Variable request handler
+    //
+    FspWrapperVariableRequestHandler (&FspHobListPtr, FspMultiPhaseMemInitApiIndex);
+  }
+
+  //
+  // See if MultiPhase process is required or not
+  //
+  FspWrapperMultiPhaseHandler (&FspHobListPtr, FspMultiPhaseMemInitApiIndex);    // FspM MultiPhase
+
+  //
   // Create hobs after memory initialization and not in temp RAM. Hence passing the recorded timestamp here
-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, TimeStampCounterStart, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
+  //
+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, TimeStampCounterStart, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
   DEBUG ((DEBUG_INFO, "Total time spent executing FspMemoryInitApi: %d millisecond\n", DivU64x32 (GetTimeInNanoSecond (AsmReadTsc () - TimeStampCounterStart), 1000000)));
-
-  //
-  // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status
-  //
-  if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FspMemoryInitApi requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
-  }
-
-  if (EFI_ERROR(Status)) {
-    DEBUG ((DEBUG_ERROR, "ERROR - Failed to execute FspMemoryInitApi(), Status = %r\n", Status));
-  }
-  DEBUG((DEBUG_INFO, "FspMemoryInit status: 0x%x\n", Status));
-  ASSERT_EFI_ERROR (Status);
-
 
   Status = TestFspMemoryInitApiOutput (FspmUpdDataPtr, &FspHobListPtr);
@@ -131 +172 @@
   //
   HobData = BuildGuidHob (
-             &gFspHobGuid,
-             sizeof (VOID *)
-             );
+              &gFspHobGuid,
+              sizeof (VOID *)
+              );
   ASSERT (HobData != NULL);
   CopyMem (HobData, &FspHobListPtr, sizeof (FspHobListPtr));
@@ -151 +192 @@
   )
 {
-  EFI_STATUS                                            Status;
-  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI *MeasurementExcludedFvPpi;
-  EFI_PEI_PPI_DESCRIPTOR                                *MeasurementExcludedPpiList;
-
-  MeasurementExcludedFvPpi = AllocatePool (sizeof(*MeasurementExcludedFvPpi));
-  ASSERT(MeasurementExcludedFvPpi != NULL);
-  MeasurementExcludedFvPpi->Count = 1;
-  MeasurementExcludedFvPpi->Fv[0].FvBase = PcdGet32 (PcdFspmBaseAddress);
-  MeasurementExcludedFvPpi->Fv[0].FvLength = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspmBaseAddress))->FvLength;
-
-  MeasurementExcludedPpiList = AllocatePool (sizeof(*MeasurementExcludedPpiList));
-  ASSERT(MeasurementExcludedPpiList != NULL);
+  EFI_STATUS                                             Status;
+  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI  *MeasurementExcludedFvPpi;
+  EFI_PEI_PPI_DESCRIPTOR                                 *MeasurementExcludedPpiList;
+
+  MeasurementExcludedFvPpi = AllocatePool (sizeof (*MeasurementExcludedFvPpi));
+  ASSERT (MeasurementExcludedFvPpi != NULL);
+  MeasurementExcludedFvPpi->Count          = 1;
+  MeasurementExcludedFvPpi->Fv[0].FvBase   = PcdGet32 (PcdFspmBaseAddress);
+  MeasurementExcludedFvPpi->Fv[0].FvLength = ((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength;
+
+  MeasurementExcludedPpiList = AllocatePool (sizeof (*MeasurementExcludedPpiList));
+  ASSERT (MeasurementExcludedPpiList != NULL);
   MeasurementExcludedPpiList->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
   MeasurementExcludedPpiList->Guid  = &gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid;
@@ -178 +219 @@
     PeiServicesInstallFvInfoPpi (
       NULL,
-      (VOID *)(UINTN) PcdGet32 (PcdFspmBaseAddress),
-      (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspmBaseAddress))->FvLength,
+      (VOID *)(UINTN)PcdGet32 (PcdFspmBaseAddress),
+      (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength,
       NULL,
       NULL
@@ -201 +242 @@
 EFIAPI
 TcgPpiNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
   );
 
-EFI_PEI_NOTIFY_DESCRIPTOR mTcgPpiNotifyDesc = {
+EFI_PEI_NOTIFY_DESCRIPTOR  mTcgPpiNotifyDesc = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEdkiiTcgPpiGuid,
@@ -225 +266 @@
 EFIAPI
 TcgPpiNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
-  )
-{
-  UINT32                    FspMeasureMask;
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
+  )
+{
+  UINT32  FspMeasureMask;
 
   DEBUG ((DEBUG_INFO, "TcgPpiNotify FSPM\n"));
@@ -237 +278 @@
 
   if ((FspMeasureMask & FSP_MEASURE_FSPT) != 0) {
-    MeasureFspFirmwareBlob (0, "FSPT", PcdGet32(PcdFsptBaseAddress),
-                            (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFsptBaseAddress))->FvLength);
+    MeasureFspFirmwareBlob (
+      0,
+      "FSPT",
+      PcdGet32 (PcdFsptBaseAddress),
+      (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFsptBaseAddress))->FvLength
+      );
   }
 
   if ((FspMeasureMask & FSP_MEASURE_FSPM) != 0) {
-    MeasureFspFirmwareBlob (0, "FSPM", PcdGet32(PcdFspmBaseAddress),
-                            (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspmBaseAddress))->FvLength);
+    MeasureFspFirmwareBlob (
+      0,
+      "FSPM",
+      PcdGet32 (PcdFspmBaseAddress),
+      (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength
+      );
   }
 
@@ -266 +315 @@
   EFI_STATUS  Status;
 
-  DEBUG((DEBUG_INFO, "FspmWrapperPeimEntryPoint\n"));
+  DEBUG ((DEBUG_INFO, "FspmWrapperPeimEntryPoint\n"));
 
   Status = PeiServicesNotifyPpi (&mTcgPpiNotifyDesc);

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf

@@ -7 +7 @@
 # notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -38 +38 @@
   FspWrapperPlatformLib
   FspWrapperHobProcessLib
+  CpuLib
   UefiCpuLib
   PeCoffGetEntryPointLib
@@ -46 +47 @@
   FspWrapperApiTestLib
   FspMeasurementLib
+  FspWrapperMultiPhaseProcessLib
 
 [Packages]
@@ -61 +63 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress       ## CONSUMES
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig  ## CONSUMES
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress64  ## CONSUMES
 
 [Sources]

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c

@@ -4 +4 @@
   notify to call FspSiliconInit API.
 
-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -22 +22 @@
 #include <Library/FspWrapperPlatformLib.h>
 #include <Library/FspWrapperHobProcessLib.h>
+#include <Library/FspWrapperMultiPhaseProcessLib.h>
 #include <Library/TimerLib.h>
 #include <Library/PerformanceLib.h>
@@ -37 +38 @@
 #include <FspEas.h>
 #include <FspStatusCode.h>
-
-extern EFI_PEI_NOTIFY_DESCRIPTOR mS3EndOfPeiNotifyDesc;
-extern EFI_GUID                  gFspHobGuid;
+#include <FspGlobalData.h>
+
+extern EFI_PEI_NOTIFY_DESCRIPTOR  mS3EndOfPeiNotifyDesc;
+extern EFI_GUID                   gFspHobGuid;
 
 /**
@@ -53 +55 @@
 EFI_STATUS
 EFIAPI
-S3EndOfPeiNotify(
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
+S3EndOfPeiNotify (
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
   );
 
-EFI_PEI_NOTIFY_DESCRIPTOR mS3EndOfPeiNotifyDesc = {
+EFI_PEI_NOTIFY_DESCRIPTOR  mS3EndOfPeiNotifyDesc = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiEndOfPeiSignalPpiGuid,
@@ -77 +79 @@
 EFI_STATUS
 EFIAPI
-S3EndOfPeiNotify(
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
-  )
-{
-  NOTIFY_PHASE_PARAMS NotifyPhaseParams;
-  EFI_STATUS          Status;
-
-  DEBUG((DEBUG_INFO, "S3EndOfPeiNotify enter\n"));
+S3EndOfPeiNotify (
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
+  )
+{
+  NOTIFY_PHASE_PARAMS  NotifyPhaseParams;
+  EFI_STATUS           Status;
+
+  DEBUG ((DEBUG_INFO, "S3EndOfPeiNotify enter\n"));
 
   NotifyPhaseParams.Phase = EnumInitPhaseAfterPciEnumeration;
-  Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  DEBUG((DEBUG_INFO, "FSP S3NotifyPhase AfterPciEnumeration status: 0x%x\n", Status));
+  Status                  = CallFspNotifyPhase (&NotifyPhaseParams);
+  DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase AfterPciEnumeration status: 0x%x\n", Status));
 
   //
@@ -96 +98 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP S3NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
   NotifyPhaseParams.Phase = EnumInitPhaseReadyToBoot;
-  Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  DEBUG((DEBUG_INFO, "FSP S3NotifyPhase ReadyToBoot status: 0x%x\n", Status));
+  Status                  = CallFspNotifyPhase (&NotifyPhaseParams);
+  DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase ReadyToBoot status: 0x%x\n", Status));
 
   //
@@ -108 +110 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP S3NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
   NotifyPhaseParams.Phase = EnumInitPhaseEndOfFirmware;
-  Status = CallFspNotifyPhase (&NotifyPhaseParams);
-  DEBUG((DEBUG_INFO, "FSP S3NotifyPhase EndOfFirmware status: 0x%x\n", Status));
+  Status                  = CallFspNotifyPhase (&NotifyPhaseParams);
+  DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase EndOfFirmware status: 0x%x\n", Status));
 
   //
@@ -120 +122 @@
   //
   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FSP S3NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
+    DEBUG ((DEBUG_INFO, "FSP S3NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));
+    CallFspWrapperResetSystem (Status);
   }
 
@@ -139 +141 @@
 EFIAPI
 FspSiliconInitDoneGetFspHobList (
-  IN  CONST EFI_PEI_SERVICES         **PeiServices,
-  IN  FSP_SILICON_INIT_DONE_PPI      *This,
-  OUT VOID                           **FspHobList
+  IN  CONST EFI_PEI_SERVICES     **PeiServices,
+  IN  FSP_SILICON_INIT_DONE_PPI  *This,
+  OUT VOID                       **FspHobList
   );
 
-FSP_SILICON_INIT_DONE_PPI mFspSiliconInitDonePpi = {
+FSP_SILICON_INIT_DONE_PPI  mFspSiliconInitDonePpi = {
   FspSiliconInitDoneGetFspHobList
 };
 
-EFI_PEI_PPI_DESCRIPTOR            mPeiFspSiliconInitDonePpi = {
+EFI_PEI_PPI_DESCRIPTOR  mPeiFspSiliconInitDonePpi = {
   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
   &gFspSiliconInitDonePpiGuid,
@@ -166 +168 @@
 EFIAPI
 FspSiliconInitDoneGetFspHobList (
-  IN  CONST EFI_PEI_SERVICES         **PeiServices,
-  IN  FSP_SILICON_INIT_DONE_PPI      *This,
-  OUT VOID                           **FspHobList
-  )
-{
-  EFI_HOB_GUID_TYPE                  *GuidHob;
+  IN  CONST EFI_PEI_SERVICES     **PeiServices,
+  IN  FSP_SILICON_INIT_DONE_PPI  *This,
+  OUT VOID                       **FspHobList
+  )
+{
+  EFI_HOB_GUID_TYPE  *GuidHob;
 
   GuidHob = GetFirstGuidHob (&gFspHobGuid);
   if (GuidHob != NULL) {
-    *FspHobList = *(VOID **)GET_GUID_HOB_DATA(GuidHob);
+    *FspHobList = *(VOID **)GET_GUID_HOB_DATA (GuidHob);
     return EFI_SUCCESS;
   } else {
@@ -183 +185 @@
 
 /**
+  Get the FSP S UPD Data address
+
+  @return FSP-S UPD Data Address
+**/
+UINTN
+GetFspsUpdDataAddress (
+  VOID
+  )
+{
+  if (PcdGet64 (PcdFspsUpdDataAddress64) != 0) {
+    return (UINTN)PcdGet64 (PcdFspsUpdDataAddress64);
+  } else {
+    return (UINTN)PcdGet32 (PcdFspsUpdDataAddress);
+  }
+}
+
+/**
   This function is for FSP dispatch mode to perform post FSP-S process.
 
@@ -195 +214 @@
 EFIAPI
 FspsWrapperEndOfPeiNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
   )
 {
@@ -214 +233 @@
   //
   Status = PeiServicesInstallPpi (&mPeiFspSiliconInitDonePpi);
-  ASSERT_EFI_ERROR(Status);
+  ASSERT_EFI_ERROR (Status);
 
   return Status;
 }
 
-EFI_PEI_NOTIFY_DESCRIPTOR mFspsWrapperEndOfPeiNotifyDesc = {
+EFI_PEI_NOTIFY_DESCRIPTOR  mFspsWrapperEndOfPeiNotifyDesc = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiEndOfPeiSignalPpiGuid,
@@ -238 +257 @@
 EFIAPI
 PeiMemoryDiscoveredNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
   );
 
-EFI_PEI_NOTIFY_DESCRIPTOR mPeiMemoryDiscoveredNotifyDesc = {
+EFI_PEI_NOTIFY_DESCRIPTOR  mPeiMemoryDiscoveredNotifyDesc = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiMemoryDiscoveredPpiGuid,
@@ -262 +281 @@
 EFIAPI
 PeiMemoryDiscoveredNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
-  )
-{
-  FSP_INFO_HEADER           *FspsHeaderPtr;
-  UINT64                    TimeStampCounterStart;
-  EFI_STATUS                Status;
-  VOID                      *FspHobListPtr;
-  EFI_HOB_GUID_TYPE         *GuidHob;
-  FSPS_UPD_COMMON           *FspsUpdDataPtr;
-  UINTN                     *SourceData;
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
+  )
+{
+  FSP_INFO_HEADER    *FspsHeaderPtr;
+  UINT64             TimeStampCounterStart;
+  EFI_STATUS         Status;
+  VOID               *FspHobListPtr;
+  EFI_HOB_GUID_TYPE  *GuidHob;
+  FSPS_UPD_COMMON    *FspsUpdDataPtr;
+  UINTN              *SourceData;
 
   DEBUG ((DEBUG_INFO, "PeiMemoryDiscoveredNotify enter\n"));
@@ -284 +303 @@
   }
 
-  if (PcdGet32 (PcdFspsUpdDataAddress) == 0 && (FspsHeaderPtr->CfgRegionSize != 0) && (FspsHeaderPtr->CfgRegionOffset != 0)) {
+  if ((GetFspsUpdDataAddress () == 0) && (FspsHeaderPtr->CfgRegionSize != 0) && (FspsHeaderPtr->CfgRegionOffset != 0)) {
     //
     // Copy default FSP-S UPD data from Flash
@@ -293 +312 @@
     CopyMem (FspsUpdDataPtr, SourceData, (UINTN)FspsHeaderPtr->CfgRegionSize);
   } else {
-    FspsUpdDataPtr = (FSPS_UPD_COMMON *)PcdGet32 (PcdFspsUpdDataAddress);
+    FspsUpdDataPtr = (FSPS_UPD_COMMON *)GetFspsUpdDataAddress ();
     ASSERT (FspsUpdDataPtr != NULL);
   }
@@ -300 +319 @@
 
   TimeStampCounterStart = AsmReadTsc ();
-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);
   Status = CallFspSiliconInit ((VOID *)FspsUpdDataPtr);
-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
+
+  //
+  // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status
+  //
+  if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
+    DEBUG ((DEBUG_INFO, "FspSiliconInitApi requested reset %r\n", Status));
+    CallFspWrapperResetSystem (Status);
+  }
+
+  if ((Status != FSP_STATUS_VARIABLE_REQUEST) && EFI_ERROR (Status)) {
+    DEBUG ((DEBUG_ERROR, "ERROR - Failed to execute FspSiliconInitApi(), Status = %r\n", Status));
+    ASSERT_EFI_ERROR (Status);
+  }
+
+  DEBUG ((DEBUG_INFO, "FspSiliconInit status: %r\n", Status));
+
+  if (Status == FSP_STATUS_VARIABLE_REQUEST) {
+    //
+    // call to Variable request handler
+    //
+    FspWrapperVariableRequestHandler (&FspHobListPtr, FspMultiPhaseSiInitApiIndex);
+  }
+
+  //
+  // See if MultiPhase process is required or not
+  //
+  FspWrapperMultiPhaseHandler (&FspHobListPtr, FspMultiPhaseSiInitApiIndex);    // FspS MultiPhase
+
+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);
   DEBUG ((DEBUG_INFO, "Total time spent executing FspSiliconInitApi: %d millisecond\n", DivU64x32 (GetTimeInNanoSecond (AsmReadTsc () - TimeStampCounterStart), 1000000)));
-
-  //
-  // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status
-  //
-  if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {
-    DEBUG((DEBUG_INFO, "FspSiliconInitApi requested reset 0x%x\n", Status));
-    CallFspWrapperResetSystem ((UINT32)Status);
-  }
-
-  if (EFI_ERROR(Status)) {
-    DEBUG ((DEBUG_ERROR, "ERROR - Failed to execute FspSiliconInitApi(), Status = %r\n", Status));
-  }
-  DEBUG((DEBUG_INFO, "FspSiliconInit status: 0x%x\n", Status));
-  ASSERT_EFI_ERROR (Status);
 
   Status = TestFspSiliconInitApiOutput ((VOID *)NULL);
@@ -337 +370 @@
   //
   Status = PeiServicesInstallPpi (&mPeiFspSiliconInitDonePpi);
-  ASSERT_EFI_ERROR(Status);
+  ASSERT_EFI_ERROR (Status);
 
   return Status;
@@ -352 +385 @@
   )
 {
-  EFI_STATUS           Status;
-  EFI_BOOT_MODE        BootMode;
+  EFI_STATUS     Status;
+  EFI_BOOT_MODE  BootMode;
 
   //
@@ -383 +416 @@
   )
 {
-  EFI_STATUS                                            Status;
-  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI *MeasurementExcludedFvPpi;
-  EFI_PEI_PPI_DESCRIPTOR                                *MeasurementExcludedPpiList;
-
-  MeasurementExcludedFvPpi = AllocatePool (sizeof(*MeasurementExcludedFvPpi));
-  ASSERT(MeasurementExcludedFvPpi != NULL);
-  MeasurementExcludedFvPpi->Count = 1;
-  MeasurementExcludedFvPpi->Fv[0].FvBase = PcdGet32 (PcdFspsBaseAddress);
-  MeasurementExcludedFvPpi->Fv[0].FvLength = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspsBaseAddress))->FvLength;
-
-  MeasurementExcludedPpiList = AllocatePool (sizeof(*MeasurementExcludedPpiList));
-  ASSERT(MeasurementExcludedPpiList != NULL);
+  EFI_STATUS                                             Status;
+  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI  *MeasurementExcludedFvPpi;
+  EFI_PEI_PPI_DESCRIPTOR                                 *MeasurementExcludedPpiList;
+
+  MeasurementExcludedFvPpi = AllocatePool (sizeof (*MeasurementExcludedFvPpi));
+  ASSERT (MeasurementExcludedFvPpi != NULL);
+  MeasurementExcludedFvPpi->Count          = 1;
+  MeasurementExcludedFvPpi->Fv[0].FvBase   = PcdGet32 (PcdFspsBaseAddress);
+  MeasurementExcludedFvPpi->Fv[0].FvLength = ((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength;
+
+  MeasurementExcludedPpiList = AllocatePool (sizeof (*MeasurementExcludedPpiList));
+  ASSERT (MeasurementExcludedPpiList != NULL);
   MeasurementExcludedPpiList->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
   MeasurementExcludedPpiList->Guid  = &gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid;
@@ -407 +440 @@
   PeiServicesInstallFvInfoPpi (
     NULL,
-    (VOID *)(UINTN) PcdGet32 (PcdFspsBaseAddress),
-    (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspsBaseAddress))->FvLength,
+    (VOID *)(UINTN)PcdGet32 (PcdFspsBaseAddress),
+    (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength,
     NULL,
     NULL
@@ -433 +466 @@
 EFIAPI
 TcgPpiNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
   );
 
-EFI_PEI_NOTIFY_DESCRIPTOR mTcgPpiNotifyDesc = {
+EFI_PEI_NOTIFY_DESCRIPTOR  mTcgPpiNotifyDesc = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEdkiiTcgPpiGuid,
@@ -457 +490 @@
 EFIAPI
 TcgPpiNotify (
-  IN EFI_PEI_SERVICES          **PeiServices,
-  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
-  IN VOID                      *Ppi
-  )
-{
-  UINT32                    FspMeasureMask;
+  IN EFI_PEI_SERVICES           **PeiServices,
+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDesc,
+  IN VOID                       *Ppi
+  )
+{
+  UINT32  FspMeasureMask;
 
   DEBUG ((DEBUG_INFO, "TcgPpiNotify FSPS\n"));
@@ -469 +502 @@
 
   if ((FspMeasureMask & FSP_MEASURE_FSPS) != 0) {
-    MeasureFspFirmwareBlob (0, "FSPS", PcdGet32(PcdFspsBaseAddress),
-                            (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspsBaseAddress))->FvLength);
+    MeasureFspFirmwareBlob (
+      0,
+      "FSPS",
+      PcdGet32 (PcdFspsBaseAddress),
+      (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength
+      );
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf

@@ -7 +7 @@
 # notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -39 +39 @@
   FspWrapperPlatformLib
   FspWrapperHobProcessLib
+  CpuLib
   UefiCpuLib
   PeCoffGetEntryPointLib
@@ -46 +47 @@
   FspWrapperApiTestLib
   FspMeasurementLib
+  FspWrapperMultiPhaseProcessLib
 
 [Packages]
@@ -69 +71 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection      ## CONSUMES
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig  ## CONSUMES
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress64  ## CONSUMES
 
 [Guids]

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Library/FspMeasurementLib.h

@@ -10 +10 @@
 #define _FSP_MEASUREMENT_LIB_H_
 
-#define FSP_MEASURE_FSP       BIT0
-#define FSP_MEASURE_FSPT      BIT1
-#define FSP_MEASURE_FSPM      BIT2
-#define FSP_MEASURE_FSPS      BIT3
-#define FSP_MEASURE_FSPUPD    BIT31
+#define FSP_MEASURE_FSP     BIT0
+#define FSP_MEASURE_FSPT    BIT1
+#define FSP_MEASURE_FSPM    BIT2
+#define FSP_MEASURE_FSPS    BIT3
+#define FSP_MEASURE_FSPUPD  BIT31
 
 /**
@@ -32 +32 @@
 EFIAPI
 MeasureFspFirmwareBlob (
-  IN UINT32                         PcrIndex,
-  IN CHAR8                          *Description OPTIONAL,
-  IN EFI_PHYSICAL_ADDRESS           FirmwareBlobBase,
-  IN UINT64                         FirmwareBlobLength
+  IN UINT32                PcrIndex,
+  IN CHAR8                 *Description OPTIONAL,
+  IN EFI_PHYSICAL_ADDRESS  FirmwareBlobBase,
+  IN UINT64                FirmwareBlobLength
   );
+
 #endif

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiLib.h

@@ -35 +35 @@
 EFIAPI
 CallFspNotifyPhase (
-  IN NOTIFY_PHASE_PARAMS *NotifyPhaseParams
+  IN NOTIFY_PHASE_PARAMS  *NotifyPhaseParams
   );
 
@@ -49 +49 @@
 EFIAPI
 CallFspMemoryInit (
-  IN VOID                       *FspmUpdDataPtr,
-  OUT VOID                      **HobListPtr
+  IN VOID   *FspmUpdDataPtr,
+  OUT VOID  **HobListPtr
   );
 
@@ -63 +63 @@
 EFIAPI
 CallTempRamExit (
-  IN VOID                       *TempRamExitParam
+  IN VOID  *TempRamExitParam
   );
 
@@ -76 +76 @@
 EFIAPI
 CallFspSiliconInit (
-  IN VOID                       *FspsUpdDataPtr
+  IN VOID  *FspsUpdDataPtr
   );
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Library/FspWrapperApiTestLib.h

@@ -23 +23 @@
 EFIAPI
 TestFspMemoryInitApiOutput (
-  IN  VOID        *FspmUpdDataPtr,
-  IN  VOID        **HobListPtr
+  IN  VOID  *FspmUpdDataPtr,
+  IN  VOID  **HobListPtr
   );
 
@@ -37 +37 @@
 EFIAPI
 TestFspTempRamExitApiOutput (
-  IN VOID        *TempRamExitParam
+  IN VOID  *TempRamExitParam
   );
 
@@ -50 +50 @@
 EFIAPI
 TestFspSiliconInitApiOutput (
-  IN  VOID        *FspsUpdDataPtr
+  IN  VOID  *FspsUpdDataPtr
   );
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Library/FspWrapperHobProcessLib.h

@@ -20 +20 @@
 EFIAPI
 PostFspmHobProcess (
-  IN VOID                 *FspHobList
+  IN VOID  *FspHobList
   );
 
@@ -33 +33 @@
 EFIAPI
 PostFspsHobProcess (
-  IN VOID                 *FspHobList
+  IN VOID  *FspHobList
   );
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Library/FspWrapperPlatformLib.h

@@ -19 +19 @@
 EFIAPI
 UpdateFspmUpdData (
-  IN OUT VOID        *FspUpdRgnPtr
+  IN OUT VOID  *FspUpdRgnPtr
   );
 
@@ -31 +31 @@
 EFIAPI
 UpdateFspsUpdData (
-  IN OUT VOID        *FspUpdRgnPtr
+  IN OUT VOID  *FspUpdRgnPtr
   );
 
@@ -61 +61 @@
 EFIAPI
 GetS3MemoryInfo (
-  OUT UINT64               *S3PeiMemSize,
-  OUT EFI_PHYSICAL_ADDRESS *S3PeiMemBase
+  OUT UINT64                *S3PeiMemSize,
+  OUT EFI_PHYSICAL_ADDRESS  *S3PeiMemBase
   );
 
@@ -75 +75 @@
 EFIAPI
 CallFspWrapperResetSystem (
-  IN UINT32    FspStatusResetType
+  IN EFI_STATUS  FspStatusResetType
   );
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Ppi/FspSiliconInitDone.h

@@ -10 +10 @@
 #define _FSP_SILICON_INIT_DONE_H_
 
-typedef struct _FSP_SILICON_INIT_DONE_PPI  FSP_SILICON_INIT_DONE_PPI;
+typedef struct _FSP_SILICON_INIT_DONE_PPI FSP_SILICON_INIT_DONE_PPI;
 
 /**
@@ -30 +30 @@
 
 struct _FSP_SILICON_INIT_DONE_PPI {
-  FSP_SILICON_INIT_DONE_GET_FSP_HOB_LIST      GetFspHobList;
+  FSP_SILICON_INIT_DONE_GET_FSP_HOB_LIST    GetFspHobList;
 };
 
-extern EFI_GUID gFspSiliconInitDonePpiGuid;
+extern EFI_GUID  gFspSiliconInitDonePpiGuid;
 
 #endif

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Include/Ppi/TopOfTemporaryRam.h

@@ -10 +10 @@
 #define _TOP_OF_TEMPORARY_RAM_H_
 
-extern EFI_GUID gTopOfTemporaryRamPpiGuid;
+extern EFI_GUID  gTopOfTemporaryRamPpiGuid;
 
 #endif

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec

@@ -2 +2 @@
 # Provides drivers and definitions to support fsp in EDKII bios.
 #
-# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29 +29 @@
   ##  @libraryclass  Provide FSP TPM measurement related function.
   FspMeasurementLib|Include/Library/FspMeasurementLib.h
+
+  ##  @libraryclass  Provide MultiPhase handling related functions.
+  FspWrapperMultiPhaseProcessLib|Include/Library/FspWrapperMultiPhaseProcessLib.h
+
+  ##  @libraryclass  Provide MultiPhase platform actions related functions.
+  FspWrapperPlatformMultiPhaseLib|Include/Library/FspWrapperPlatformMultiPhaseLib.h
+
+
 [Guids]
   #
@@ -57 +65 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00200000|UINT32|0x10000002
 
-  ## Indicates the base address of the first Microcode Patch in the Microcode Region
-  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0x0|UINT64|0x10000005
-  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x0|UINT64|0x10000006
-  ## Indicates the offset of the Cpu Microcode.
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset|0x90|UINT32|0x10000007
-
   ## Indicate the PEI memory size platform want to report
   gIntelFsp2WrapperTokenSpaceGuid.PcdPeiMinMemSize|0x1800000|UINT32|0x40000004
@@ -89 +91 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdSkipFspApi|0x00000000|UINT32|0x40000009
 
-  ## This PCD decides how Wrapper code utilizes FSP
-  # 0: DISPATCH mode (FSP Wrapper will load PeiCore from FSP without calling FSP API)
-  # 1: API mode (FSP Wrapper will call FSP API)
-  #
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0x00000001|UINT8|0x4000000A
-
   ## This PCD decides how FSP is measured
   # 1) The BootGuard ACM may already measured the FSP component, such as FSPT/FSPM.
@@ -100 +96 @@
   # 2) The FSP binary includes FSP code and FSP UPD region. The UPD region is considered
   # as configuration block, and it may be updated by OEM by design.
-  # This flag (PCD) is to indicate if we need isolate the the UPD region from the FSP code region.
+  # This flag (PCD) is to indicate if we need isolate the UPD region from the FSP code region.
   # BIT0: Need measure FSP. (for FSP1.x) - reserved in FSP2.
   # BIT1: Need measure FSPT. (for FSP 2.x)
@@ -113 +109 @@
 
 [PcdsFixedAtBuild, PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]
+  ## This PCD decides how Wrapper code utilizes FSP
+  # 0: DISPATCH mode (FSP Wrapper will load PeiCore from FSP without calling FSP API)
+  # 1: API mode (FSP Wrapper will call FSP API)
+  #
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0x00000001|UINT8|0x4000000A
+
   #
   ## These are the base address of FSP-M/S
@@ -128 +130 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress|0x00000000|UINT32|0x50000000
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|0x00000000|UINT32|0x50000001
+  #
+  # Non-0 means PcdFspmUpdDataAddress will be ignored, otherwise PcdFspmUpdDataAddress will be used.
+  #
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress64|0x00000000|UINT64|0x50000002
+  #
+  # Non-0 means PcdFspsUpdDataAddress will be ignored, otherwise PcdFspsUpdDataAddress will be used.
+  #
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress64|0x00000000|UINT64|0x50000003

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc

@@ -2 +2 @@
 # Provides drivers and definitions to support fsp in EDKII bios.
 #
-# Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -49 +49 @@
   FspWrapperApiTestLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperApiTestLibNull/BaseFspWrapperApiTestLibNull.inf
   FspMeasurementLib|IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/BaseFspMeasurementLib.inf
+  FspWrapperPlatformMultiPhaseLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull/BaseFspWrapperPlatformMultiPhaseLibNull.inf
+  FspWrapperMultiPhaseProcessLib|IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib/FspWrapperMultiPhaseProcessLib.inf
 
   # FSP platform sample
@@ -92 +94 @@
   IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformLibSample/BaseFspWrapperPlatformLibSample.inf
   IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
+  IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformMultiPhaseLibNull/BaseFspWrapperPlatformMultiPhaseLibNull.inf
+  IntelFsp2WrapperPkg/Library/FspWrapperMultiPhaseProcessLib/FspWrapperMultiPhaseProcessLib.inf
 
 [PcdsFixedAtBuild.common]

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c

@@ -44 +44 @@
 EFIAPI
 TpmMeasureAndLogDataWithFlags (
-  IN UINT32             PcrIndex,
-  IN UINT32             EventType,
-  IN VOID               *EventLog,
-  IN UINT32             LogLen,
-  IN VOID               *HashData,
-  IN UINT64             HashDataLen,
-  IN UINT64             Flags
+  IN UINT32  PcrIndex,
+  IN UINT32  EventType,
+  IN VOID    *EventLog,
+  IN UINT32  LogLen,
+  IN VOID    *HashData,
+  IN UINT64  HashDataLen,
+  IN UINT64  Flags
   )
 {
-  EFI_STATUS                Status;
-  EDKII_TCG_PPI             *TcgPpi;
-  TCG_PCR_EVENT_HDR         TcgEventHdr;
-
-  Status = PeiServicesLocatePpi(
+  EFI_STATUS         Status;
+  EDKII_TCG_PPI      *TcgPpi;
+  TCG_PCR_EVENT_HDR  TcgEventHdr;
+
+  Status = PeiServicesLocatePpi (
              &gEdkiiTcgPpiGuid,
              0,
              NULL,
-             (VOID**)&TcgPpi
+             (VOID **)&TcgPpi
              );
-  if (EFI_ERROR(Status)) {
+  if (EFI_ERROR (Status)) {
     return Status;
   }
@@ -100 +100 @@
 EFIAPI
 MeasureFspFirmwareBlobWithCfg (
-  IN CHAR8                          *Description OPTIONAL,
-  IN EFI_PHYSICAL_ADDRESS           FirmwareBlobBase,
-  IN UINT64                         FirmwareBlobLength,
-  IN UINT32                         CfgRegionOffset,
-  IN UINT32                         CfgRegionSize
+  IN CHAR8                 *Description OPTIONAL,
+  IN EFI_PHYSICAL_ADDRESS  FirmwareBlobBase,
+  IN UINT64                FirmwareBlobLength,
+  IN UINT32                CfgRegionOffset,
+  IN UINT32                CfgRegionSize
   )
 {
-  EFI_PLATFORM_FIRMWARE_BLOB        FvBlob, UpdBlob;
-  PLATFORM_FIRMWARE_BLOB2_STRUCT    FvBlob2, UpdBlob2;
-  VOID                              *FvName;
-  UINT32                            FvEventType;
-  VOID                              *FvEventLog, *UpdEventLog;
-  UINT32                            FvEventLogSize, UpdEventLogSize;
-  EFI_STATUS                        Status;
-  HASH_HANDLE                       HashHandle;
-  UINT8                             *HashBase;
-  UINTN                             HashSize;
-  TPML_DIGEST_VALUES                DigestList;
+  EFI_PLATFORM_FIRMWARE_BLOB      FvBlob, UpdBlob;
+  PLATFORM_FIRMWARE_BLOB2_STRUCT  FvBlob2, UpdBlob2;
+  VOID                            *FvName;
+  UINT32                          FvEventType;
+  VOID                            *FvEventLog, *UpdEventLog;
+  UINT32                          FvEventLogSize, UpdEventLogSize;
+  EFI_STATUS                      Status;
+  HASH_HANDLE                     HashHandle;
+  UINT8                           *HashBase;
+  UINTN                           HashSize;
+  TPML_DIGEST_VALUES              DigestList;
 
   FvName = TpmMeasurementGetFvName (FirmwareBlobBase, FirmwareBlobLength);
 
   if (((Description != NULL) || (FvName != NULL)) &&
-      (PcdGet32(PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105)) {
+      (PcdGet32 (PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105))
+  {
     if (Description != NULL) {
-      AsciiSPrint((CHAR8*)FvBlob2.BlobDescription, sizeof(FvBlob2.BlobDescription), "%a", Description);
-      AsciiSPrint((CHAR8*)UpdBlob2.BlobDescription, sizeof(UpdBlob2.BlobDescription), "%aUDP", Description);
-     } else {
-      AsciiSPrint((CHAR8*)FvBlob2.BlobDescription, sizeof(FvBlob2.BlobDescription), "Fv(%g)", FvName);
-      AsciiSPrint((CHAR8*)UpdBlob2.BlobDescription, sizeof(UpdBlob2.BlobDescription), "(%g)UDP", FvName);
+      AsciiSPrint ((CHAR8 *)FvBlob2.BlobDescription, sizeof (FvBlob2.BlobDescription), "%a", Description);
+      AsciiSPrint ((CHAR8 *)UpdBlob2.BlobDescription, sizeof (UpdBlob2.BlobDescription), "%aUDP", Description);
+    } else {
+      AsciiSPrint ((CHAR8 *)FvBlob2.BlobDescription, sizeof (FvBlob2.BlobDescription), "Fv(%g)", FvName);
+      AsciiSPrint ((CHAR8 *)UpdBlob2.BlobDescription, sizeof (UpdBlob2.BlobDescription), "(%g)UDP", FvName);
     }
 
-    FvBlob2.BlobDescriptionSize = sizeof(FvBlob2.BlobDescription);
-    FvBlob2.BlobBase = FirmwareBlobBase;
-    FvBlob2.BlobLength = FirmwareBlobLength;
-    FvEventType = EV_EFI_PLATFORM_FIRMWARE_BLOB2;
-    FvEventLog = &FvBlob2;
-    FvEventLogSize = sizeof(FvBlob2);
-
-    UpdBlob2.BlobDescriptionSize = sizeof(UpdBlob2.BlobDescription);
-    UpdBlob2.BlobBase = CfgRegionOffset;
-    UpdBlob2.BlobLength = CfgRegionSize;
-    UpdEventLog = &UpdBlob2;
-    UpdEventLogSize = sizeof(UpdBlob2);
+    FvBlob2.BlobDescriptionSize = sizeof (FvBlob2.BlobDescription);
+    FvBlob2.BlobBase            = FirmwareBlobBase;
+    FvBlob2.BlobLength          = FirmwareBlobLength;
+    FvEventType                 = EV_EFI_PLATFORM_FIRMWARE_BLOB2;
+    FvEventLog                  = &FvBlob2;
+    FvEventLogSize              = sizeof (FvBlob2);
+
+    UpdBlob2.BlobDescriptionSize = sizeof (UpdBlob2.BlobDescription);
+    UpdBlob2.BlobBase            = CfgRegionOffset;
+    UpdBlob2.BlobLength          = CfgRegionSize;
+    UpdEventLog                  = &UpdBlob2;
+    UpdEventLogSize              = sizeof (UpdBlob2);
   } else {
-    FvBlob.BlobBase = FirmwareBlobBase;
+    FvBlob.BlobBase   = FirmwareBlobBase;
     FvBlob.BlobLength = FirmwareBlobLength;
-    FvEventType = EV_EFI_PLATFORM_FIRMWARE_BLOB;
-    FvEventLog = &FvBlob;
-    FvEventLogSize = sizeof(FvBlob);
-
-    UpdBlob.BlobBase = CfgRegionOffset;
+    FvEventType       = EV_EFI_PLATFORM_FIRMWARE_BLOB;
+    FvEventLog        = &FvBlob;
+    FvEventLogSize    = sizeof (FvBlob);
+
+    UpdBlob.BlobBase   = CfgRegionOffset;
     UpdBlob.BlobLength = CfgRegionSize;
-    UpdEventLog = &UpdBlob;
-    UpdEventLogSize = sizeof(UpdBlob);
+    UpdEventLog        = &UpdBlob;
+    UpdEventLogSize    = sizeof (UpdBlob);
   }
 
@@ -164 +165 @@
 
   /** Hash FSP binary before UDP **/
-  HashBase = (UINT8 *) (UINTN) FirmwareBlobBase;
-  HashSize = (UINTN) CfgRegionOffset;
-  Status = HashUpdate (HashHandle, HashBase, HashSize);
+  HashBase = (UINT8 *)(UINTN)FirmwareBlobBase;
+  HashSize = (UINTN)CfgRegionOffset;
+  Status   = HashUpdate (HashHandle, HashBase, HashSize);
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "HashUpdate failed - %r\n", Status));
@@ -173 +174 @@
 
   /** Hash FSP binary after UDP **/
-  HashBase = (UINT8 *) (UINTN) FirmwareBlobBase + CfgRegionOffset + CfgRegionSize;
+  HashBase = (UINT8 *)(UINTN)FirmwareBlobBase + CfgRegionOffset + CfgRegionSize;
   HashSize = (UINTN)(FirmwareBlobLength - CfgRegionOffset - CfgRegionSize);
-  Status = HashUpdate (HashHandle, HashBase, HashSize);
+  Status   = HashUpdate (HashHandle, HashBase, HashSize);
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "HashUpdate failed - %r\n", Status));
@@ -193 +194 @@
              FvEventLog,
              FvEventLogSize,
-             (UINT8 *) &DigestList,
-             (UINTN) sizeof(DigestList),
+             (UINT8 *)&DigestList,
+             (UINTN)sizeof (DigestList),
              EDKII_TCG_PRE_HASH_LOG_ONLY
              );
@@ -203 +204 @@
              UpdEventLog,
              UpdEventLogSize,
-             (UINT8 *) (UINTN) FirmwareBlobBase + CfgRegionOffset,
+             (UINT8 *)(UINTN)FirmwareBlobBase + CfgRegionOffset,
              CfgRegionSize
              );
@@ -226 +227 @@
 EFIAPI
 MeasureFspFirmwareBlob (
-  IN UINT32                         PcrIndex,
-  IN CHAR8                          *Description OPTIONAL,
-  IN EFI_PHYSICAL_ADDRESS           FirmwareBlobBase,
-  IN UINT64                         FirmwareBlobLength
+  IN UINT32                PcrIndex,
+  IN CHAR8                 *Description OPTIONAL,
+  IN EFI_PHYSICAL_ADDRESS  FirmwareBlobBase,
+  IN UINT64                FirmwareBlobLength
   )
 {
@@ -237 +238 @@
   FspMeasureMask = PcdGet32 (PcdFspMeasurementConfig);
   if ((FspMeasureMask & FSP_MEASURE_FSPUPD) != 0) {
-    FspHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (FirmwareBlobBase);
+    FspHeaderPtr = (FSP_INFO_HEADER *)FspFindFspHeader (FirmwareBlobBase);
     if (FspHeaderPtr != NULL) {
-      return MeasureFspFirmwareBlobWithCfg(Description, FirmwareBlobBase, FirmwareBlobLength,
-                                           FspHeaderPtr->CfgRegionOffset, FspHeaderPtr->CfgRegionSize);
+      return MeasureFspFirmwareBlobWithCfg (
+               Description,
+               FirmwareBlobBase,
+               FirmwareBlobLength,
+               FspHeaderPtr->CfgRegionOffset,
+               FspHeaderPtr->CfgRegionSize
+               );
     }
   }
@@ -246 +252 @@
   return MeasureFirmwareBlob (PcrIndex, Description, FirmwareBlobBase, FirmwareBlobLength);
 }
-

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c

@@ -2 +2 @@
   Provide FSP API related function.
 
-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -14 +14 @@
 
 /**
-  Wrapper for a thunk  to transition from long mode to compatibility mode to execute 32-bit code and then transit back to
+  Wrapper for a thunk to transition from long mode to compatibility mode to execute 32-bit code and then transit back to
   long mode.
 
@@ -25 +25 @@
 EFI_STATUS
 Execute32BitCode (
-  IN UINT64      Function,
-  IN UINT64      Param1,
-  IN UINT64      Param2
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
+  );
+
+/**
+  Wrapper to execute 64-bit code directly from long mode.
+
+  @param[in] Function     The 64bit code entry to be executed.
+  @param[in] Param1       The first parameter to pass to 64bit code.
+  @param[in] Param2       The second parameter to pass to 64bit code.
+
+  @return EFI_STATUS.
+**/
+EFI_STATUS
+Execute64BitCode (
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
   );
 
@@ -43 +59 @@
   )
 {
-  UINT8 *CheckPointer;
-
-  CheckPointer = (UINT8 *) (UINTN) FlashFvFspBase;
+  UINT8  *CheckPointer;
+
+  CheckPointer = (UINT8 *)(UINTN)FlashFvFspBase;
 
   if (((EFI_FIRMWARE_VOLUME_HEADER *)CheckPointer)->Signature != EFI_FVH_SIGNATURE) {
@@ -54 +70 @@
     CheckPointer = CheckPointer + ((EFI_FIRMWARE_VOLUME_HEADER *)CheckPointer)->ExtHeaderOffset;
     CheckPointer = CheckPointer + ((EFI_FIRMWARE_VOLUME_EXT_HEADER *)CheckPointer)->ExtHeaderSize;
-    CheckPointer = (UINT8 *) ALIGN_POINTER (CheckPointer, 8);
+    CheckPointer = (UINT8 *)ALIGN_POINTER (CheckPointer, 8);
   } else {
     CheckPointer = CheckPointer + ((EFI_FIRMWARE_VOLUME_HEADER *)CheckPointer)->HeaderLength;
   }
-
 
   CheckPointer = CheckPointer + sizeof (EFI_FFS_FILE_HEADER);
@@ -81 +96 @@
 EFIAPI
 CallFspNotifyPhase (
-  IN NOTIFY_PHASE_PARAMS *NotifyPhaseParams
-  )
-{
-  FSP_INFO_HEADER     *FspHeader;
-  FSP_NOTIFY_PHASE    NotifyPhaseApi;
-  EFI_STATUS          Status;
-  BOOLEAN             InterruptState;
+  IN NOTIFY_PHASE_PARAMS  *NotifyPhaseParams
+  )
+{
+  FSP_INFO_HEADER   *FspHeader;
+  FSP_NOTIFY_PHASE  NotifyPhaseApi;
+  EFI_STATUS        Status;
+  BOOLEAN           InterruptState;
 
   FspHeader = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspsBaseAddress));
@@ -96 +111 @@
   NotifyPhaseApi = (FSP_NOTIFY_PHASE)((UINTN)FspHeader->ImageBase + FspHeader->NotifyPhaseEntryOffset);
   InterruptState = SaveAndDisableInterrupts ();
-  Status = Execute32BitCode ((UINTN)NotifyPhaseApi, (UINTN)NotifyPhaseParams, (UINTN)NULL);
+  if ((FspHeader->ImageAttribute & IMAGE_ATTRIBUTE_64BIT_MODE_SUPPORT) == FSP_IA32) {
+    Status = Execute32BitCode ((UINTN)NotifyPhaseApi, (UINTN)NotifyPhaseParams, (UINTN)NULL);
+  } else {
+    Status = Execute64BitCode ((UINTN)NotifyPhaseApi, (UINTN)NotifyPhaseParams, (UINTN)NULL);
+  }
+
   SetInterruptState (InterruptState);
 
@@ -113 +133 @@
 EFIAPI
 CallFspMemoryInit (
-  IN VOID                       *FspmUpdDataPtr,
-  OUT VOID                      **HobListPtr
-  )
-{
-  FSP_INFO_HEADER     *FspHeader;
-  FSP_MEMORY_INIT     FspMemoryInitApi;
-  EFI_STATUS          Status;
-  BOOLEAN             InterruptState;
+  IN VOID   *FspmUpdDataPtr,
+  OUT VOID  **HobListPtr
+  )
+{
+  FSP_INFO_HEADER  *FspHeader;
+  FSP_MEMORY_INIT  FspMemoryInitApi;
+  EFI_STATUS       Status;
+  BOOLEAN          InterruptState;
 
   FspHeader = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
@@ -128 +148 @@
 
   FspMemoryInitApi = (FSP_MEMORY_INIT)((UINTN)FspHeader->ImageBase + FspHeader->FspMemoryInitEntryOffset);
-  InterruptState = SaveAndDisableInterrupts ();
-  Status = Execute32BitCode ((UINTN)FspMemoryInitApi, (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
+  InterruptState   = SaveAndDisableInterrupts ();
+  if ((FspHeader->ImageAttribute & IMAGE_ATTRIBUTE_64BIT_MODE_SUPPORT) == FSP_IA32) {
+    Status = Execute32BitCode ((UINTN)FspMemoryInitApi, (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
+  } else {
+    Status = Execute64BitCode ((UINTN)FspMemoryInitApi, (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
+  }
+
   SetInterruptState (InterruptState);
 
@@ -145 +170 @@
 EFIAPI
 CallTempRamExit (
-  IN VOID                       *TempRamExitParam
-  )
-{
-  FSP_INFO_HEADER     *FspHeader;
-  FSP_TEMP_RAM_EXIT   TempRamExitApi;
-  EFI_STATUS          Status;
-  BOOLEAN             InterruptState;
+  IN VOID  *TempRamExitParam
+  )
+{
+  FSP_INFO_HEADER    *FspHeader;
+  FSP_TEMP_RAM_EXIT  TempRamExitApi;
+  EFI_STATUS         Status;
+  BOOLEAN            InterruptState;
 
   FspHeader = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
@@ -160 +185 @@
   TempRamExitApi = (FSP_TEMP_RAM_EXIT)((UINTN)FspHeader->ImageBase + FspHeader->TempRamExitEntryOffset);
   InterruptState = SaveAndDisableInterrupts ();
-  Status = Execute32BitCode ((UINTN)TempRamExitApi, (UINTN)TempRamExitParam, (UINTN)NULL);
+  if ((FspHeader->ImageAttribute & IMAGE_ATTRIBUTE_64BIT_MODE_SUPPORT) == FSP_IA32) {
+    Status = Execute32BitCode ((UINTN)TempRamExitApi, (UINTN)TempRamExitParam, (UINTN)NULL);
+  } else {
+    Status = Execute64BitCode ((UINTN)TempRamExitApi, (UINTN)TempRamExitParam, (UINTN)NULL);
+  }
+
   SetInterruptState (InterruptState);
 
@@ -176 +206 @@
 EFIAPI
 CallFspSiliconInit (
-  IN VOID                       *FspsUpdDataPtr
-  )
-{
-  FSP_INFO_HEADER     *FspHeader;
-  FSP_SILICON_INIT    FspSiliconInitApi;
-  EFI_STATUS          Status;
-  BOOLEAN             InterruptState;
+  IN VOID  *FspsUpdDataPtr
+  )
+{
+  FSP_INFO_HEADER   *FspHeader;
+  FSP_SILICON_INIT  FspSiliconInitApi;
+  EFI_STATUS        Status;
+  BOOLEAN           InterruptState;
 
   FspHeader = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspsBaseAddress));
@@ -190 +220 @@
 
   FspSiliconInitApi = (FSP_SILICON_INIT)((UINTN)FspHeader->ImageBase + FspHeader->FspSiliconInitEntryOffset);
-  InterruptState = SaveAndDisableInterrupts ();
-  Status = Execute32BitCode ((UINTN)FspSiliconInitApi, (UINTN)FspsUpdDataPtr, (UINTN)NULL);
-  SetInterruptState (InterruptState);
-
-  return Status;
-}
+  InterruptState    = SaveAndDisableInterrupts ();
+  if ((FspHeader->ImageAttribute & IMAGE_ATTRIBUTE_64BIT_MODE_SUPPORT) == FSP_IA32) {
+    Status = Execute32BitCode ((UINTN)FspSiliconInitApi, (UINTN)FspsUpdDataPtr, (UINTN)NULL);
+  } else {
+    Status = Execute64BitCode ((UINTN)FspSiliconInitApi, (UINTN)FspsUpdDataPtr, (UINTN)NULL);
+  }
+
+  SetInterruptState (InterruptState);
+
+  return Status;
+}

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c

@@ -2 +2 @@
   Execute 32-bit code in Protected Mode.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -20 +20 @@
 typedef
 EFI_STATUS
-(EFIAPI *FSP_FUNCTION) (
+(EFIAPI *FSP_FUNCTION)(
   IN VOID *Param1,
   IN VOID *Param2
@@ -37 +37 @@
 EFI_STATUS
 Execute32BitCode (
-  IN UINT64      Function,
-  IN UINT64      Param1,
-  IN UINT64      Param2
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
   )
 {
-  FSP_FUNCTION               EntryFunc;
-  EFI_STATUS                 Status;
+  FSP_FUNCTION  EntryFunc;
+  EFI_STATUS    Status;
 
-  EntryFunc = (FSP_FUNCTION) (UINTN) (Function);
+  EntryFunc = (FSP_FUNCTION)(UINTN)(Function);
   Status    = EntryFunc ((VOID *)(UINTN)Param1, (VOID *)(UINTN)Param2);
 
@@ -51 +51 @@
 }
 
+/**
+  Wrapper for a thunk to transition from compatibility mode to long mode to execute 64-bit code and then transit back to
+  compatibility mode.
+
+  @param[in] Function     The 64bit code entry to be executed.
+  @param[in] Param1       The first parameter to pass to 64bit code.
+  @param[in] Param2       The second parameter to pass to 64bit code.
+
+  @return EFI_STATUS.
+**/
+EFI_STATUS
+Execute64BitCode (
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
+  )
+{
+  return EFI_UNSUPPORTED;
+}

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/DispatchExecute.c

@@ -1 +1 @@
 /** @file
-  Execute 32-bit code in Long Mode.
+  Execute 64-bit code in Long Mode.
   Provide a thunk function to transition from long mode to compatibility mode to execute 32-bit code and then transit
   back to long mode.
 
-  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -13 +13 @@
 #include <FspEas.h>
 
+/**
+  FSP API functions.
+
+  @param[in] Param1       The first parameter to pass to 64bit code.
+  @param[in] Param2       The second parameter to pass to 64bit code.
+
+  @return EFI_STATUS.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *FSP_FUNCTION)(
+  IN VOID *Param1,
+  IN VOID *Param2
+  );
+
 #pragma pack(1)
 typedef union {
   struct {
-    UINT32  LimitLow    : 16;
-    UINT32  BaseLow     : 16;
-    UINT32  BaseMid     : 8;
-    UINT32  Type        : 4;
-    UINT32  System      : 1;
-    UINT32  Dpl         : 2;
-    UINT32  Present     : 1;
-    UINT32  LimitHigh   : 4;
-    UINT32  Software    : 1;
-    UINT32  Reserved    : 1;
-    UINT32  DefaultSize : 1;
-    UINT32  Granularity : 1;
-    UINT32  BaseHigh    : 8;
+    UINT32    LimitLow    : 16;
+    UINT32    BaseLow     : 16;
+    UINT32    BaseMid     : 8;
+    UINT32    Type        : 4;
+    UINT32    System      : 1;
+    UINT32    Dpl         : 2;
+    UINT32    Present     : 1;
+    UINT32    LimitHigh   : 4;
+    UINT32    Software    : 1;
+    UINT32    Reserved    : 1;
+    UINT32    DefaultSize : 1;
+    UINT32    Granularity : 1;
+    UINT32    BaseHigh    : 8;
   } Bits;
-  UINT64  Uint64;
+  UINT64    Uint64;
 } IA32_GDT;
 #pragma pack()
 
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT mGdtEntries[] = {
-  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, /* 0x0:  reserve */
-  {{0xFFFF, 0,  0,  0xB,  1,  0,  1,  0xF,  0,  0, 1,  1,  0}}, /* 0x8:  compatibility mode */
-  {{0xFFFF, 0,  0,  0xB,  1,  0,  1,  0xF,  0,  1, 0,  1,  0}}, /* 0x10: for long mode */
-  {{0xFFFF, 0,  0,  0x3,  1,  0,  1,  0xF,  0,  0, 1,  1,  0}}, /* 0x18: data */
-  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, /* 0x20: reserve */
+GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT  mGdtEntries[] = {
+  {
+    { 0,      0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0, 0 }
+  },                                                            /* 0x0:  reserve */
+  {
+    { 0xFFFF, 0, 0, 0xB, 1, 0, 1, 0xF, 0, 0, 1, 1, 0 }
+  },                                                            /* 0x8:  compatibility mode */
+  {
+    { 0xFFFF, 0, 0, 0xB, 1, 0, 1, 0xF, 0, 1, 0, 1, 0 }
+  },                                                            /* 0x10: for long mode */
+  {
+    { 0xFFFF, 0, 0, 0x3, 1, 0, 1, 0xF, 0, 0, 1, 1, 0 }
+  },                                                            /* 0x18: data */
+  {
+    { 0,      0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0, 0 }
+  },                                                            /* 0x20: reserve */
 };
 
@@ -45 +70 @@
 // IA32 Gdt register
 //
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_DESCRIPTOR mGdt = {
+GLOBAL_REMOVE_IF_UNREFERENCED IA32_DESCRIPTOR  mGdt = {
   sizeof (mGdtEntries) - 1,
-  (UINTN) mGdtEntries
-  };
+  (UINTN)mGdtEntries
+};
 
 /**
@@ -71 +96 @@
 
 /**
-  Wrapper for a thunk  to transition from long mode to compatibility mode to execute 32-bit code and then transit back to
+  Wrapper for a thunk to transition from long mode to compatibility mode to execute 32-bit code and then transit back to
   long mode.
 
@@ -82 +107 @@
 EFI_STATUS
 Execute32BitCode (
-  IN UINT64      Function,
-  IN UINT64      Param1,
-  IN UINT64      Param2
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
   )
 {
@@ -97 +122 @@
   AsmReadIdtr (&Idtr);
   Status = AsmExecute32BitCode (Function, Param1, Param2, &mGdt);
+  //
+  // Convert FSP Status code from 32bit to 64bit to match caller expectation.
+  //
+  Status = (Status & ~(BIT31 + BIT30)) | LShiftU64 (Status & (BIT31 + BIT30), 32);
   AsmWriteIdtr (&Idtr);
 
@@ -102 +131 @@
 }
 
+/**
+  Wrapper to execute 64-bit code directly from long mode.
+
+  @param[in] Function     The 64bit code entry to be executed.
+  @param[in] Param1       The first parameter to pass to 64bit code.
+  @param[in] Param2       The second parameter to pass to 64bit code.
+
+  @return EFI_STATUS.
+**/
+EFI_STATUS
+Execute64BitCode (
+  IN UINT64  Function,
+  IN UINT64  Param1,
+  IN UINT64  Param2
+  )
+{
+  FSP_FUNCTION  EntryFunc;
+  EFI_STATUS    Status;
+
+  EntryFunc = (FSP_FUNCTION)(UINTN)(Function);
+  Status    = EntryFunc ((VOID *)(UINTN)Param1, (VOID *)(UINTN)Param2);
+
+  return Status;
+}

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c

@@ -20 +20 @@
 EFIAPI
 TestFspMemoryInitApiOutput (
-  IN  VOID        *FspmUpdDataPtr,
-  IN  VOID        **HobListPtr
+  IN  VOID  *FspmUpdDataPtr,
+  IN  VOID  **HobListPtr
   )
 {
@@ -37 +37 @@
 EFIAPI
 TestFspTempRamExitApiOutput (
-  IN VOID         *TempRamExitParam
+  IN VOID  *TempRamExitParam
   )
 {
@@ -53 +53 @@
 EFIAPI
 TestFspSiliconInitApiOutput (
-  IN  VOID        *FspsUpdDataPtr
+  IN  VOID  *FspsUpdDataPtr
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c

@@ -21 +21 @@
 EFIAPI
 UpdateFspmUpdData (
-  IN OUT VOID        *FspUpdRgnPtr
+  IN OUT VOID  *FspUpdRgnPtr
   )
 {
@@ -35 +35 @@
 EFIAPI
 UpdateFspsUpdData (
-  IN OUT VOID        *FspUpdRgnPtr
+  IN OUT VOID  *FspUpdRgnPtr
   )
 {
@@ -70 +70 @@
 EFIAPI
 GetS3MemoryInfo (
-  OUT UINT64               *S3PeiMemSize,
-  OUT EFI_PHYSICAL_ADDRESS *S3PeiMemBase
+  OUT UINT64                *S3PeiMemSize,
+  OUT EFI_PHYSICAL_ADDRESS  *S3PeiMemBase
   )
 {
@@ -87 +87 @@
 EFIAPI
 CallFspWrapperResetSystem (
-  IN UINT32    FspStatusResetType
+  IN EFI_STATUS  FspStatusResetType
   )
 {
@@ -94 +94 @@
   //
 
-  CpuDeadLoop();
+  CpuDeadLoop ();
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/FspWrapperApiTest.c

@@ -24 +24 @@
 EFIAPI
 TestFspMemoryInitApiOutput (
-  IN  VOID        *FspmUpdDataPtr,
-  IN  VOID        **HobListPtr
+  IN  VOID  *FspmUpdDataPtr,
+  IN  VOID  **HobListPtr
   )
 {
   DEBUG_CODE_BEGIN ();
-  EFI_PEI_HOB_POINTERS        Hob;
+  EFI_PEI_HOB_POINTERS  Hob;
 
   Hob.Raw = (UINT8 *)(*(HobListPtr));
   while (TRUE) {
-    if (END_OF_HOB_LIST(Hob) == TRUE) {
-      DEBUG((DEBUG_INFO, "gFspBootLoaderTolumHobGuid not Found\n"));
+    if (END_OF_HOB_LIST (Hob) == TRUE) {
+      DEBUG ((DEBUG_INFO, "gFspBootLoaderTolumHobGuid not Found\n"));
       break;
     }
+
     if ((CompareGuid (&Hob.ResourceDescriptor->Owner, &gFspBootLoaderTolumHobGuid))) {
       DEBUG ((DEBUG_INFO, "gFspBootLoaderTolumHobGuid Found\n"));
@@ -43 +44 @@
       break;
     }
+
     Hob.Raw = GET_NEXT_HOB (Hob);
   }
+
   DEBUG_CODE_END ();
 
@@ -60 +63 @@
 EFIAPI
 TestFspTempRamExitApiOutput (
-  IN VOID         *TempRamExitParam
+  IN VOID  *TempRamExitParam
   )
 {
@@ -76 +79 @@
 EFIAPI
 TestFspSiliconInitApiOutput (
-  IN  VOID        *FspsUpdDataPtr
+  IN  VOID  *FspsUpdDataPtr
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c

@@ -27 +27 @@
 // It should be consistent between RetrieveRequiredMemorySize() and GetPeiMemSize()
 //
-#define PEI_ADDITIONAL_MEMORY_SIZE    (16 * EFI_PAGE_SIZE)
+#define PEI_ADDITIONAL_MEMORY_SIZE  (16 * EFI_PAGE_SIZE)
 
 /**
@@ -38 +38 @@
 UINT64
 GetMemorySizeInMemoryTypeInformation (
-  IN EFI_PEI_SERVICES **PeiServices
-  )
-{
-  EFI_STATUS                  Status;
-  EFI_PEI_HOB_POINTERS        Hob;
-  EFI_MEMORY_TYPE_INFORMATION *MemoryData;
-  UINT8                       Index;
-  UINTN                       TempPageNum;
+  IN EFI_PEI_SERVICES  **PeiServices
+  )
+{
+  EFI_STATUS                   Status;
+  EFI_PEI_HOB_POINTERS         Hob;
+  EFI_MEMORY_TYPE_INFORMATION  *MemoryData;
+  UINT8                        Index;
+  UINTN                        TempPageNum;
 
   MemoryData = NULL;
-  Status     = (*PeiServices)->GetHobList ((CONST EFI_PEI_SERVICES**)PeiServices, (VOID **) &Hob.Raw);
+  Status     = (*PeiServices)->GetHobList ((CONST EFI_PEI_SERVICES **)PeiServices, (VOID **)&Hob.Raw);
   ASSERT_EFI_ERROR (Status);
   while (!END_OF_HOB_LIST (Hob)) {
-    if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION &&
-      CompareGuid (&Hob.Guid->Name, &gEfiMemoryTypeInformationGuid)) {
-      MemoryData = (EFI_MEMORY_TYPE_INFORMATION *) (Hob.Raw + sizeof (EFI_HOB_GENERIC_HEADER) + sizeof (EFI_GUID));
+    if ((Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) &&
+        CompareGuid (&Hob.Guid->Name, &gEfiMemoryTypeInformationGuid))
+    {
+      MemoryData = (EFI_MEMORY_TYPE_INFORMATION *)(Hob.Raw + sizeof (EFI_HOB_GENERIC_HEADER) + sizeof (EFI_GUID));
       break;
     }
@@ -84 +85 @@
 UINT64
 RetrieveRequiredMemorySize (
-  IN EFI_PEI_SERVICES **PeiServices
-  )
-{
-  UINT64                      Size;
+  IN EFI_PEI_SERVICES  **PeiServices
+  )
+{
+  UINT64  Size;
 
   Size = GetMemorySizeInMemoryTypeInformation (PeiServices);
@@ -103 +104 @@
 UINT64
 GetPeiMemSize (
-  IN EFI_PEI_SERVICES **PeiServices,
-  IN UINT32           BootMode
-  )
-{
-  UINT64                      Size;
-  UINT64                      MinSize;
+  IN EFI_PEI_SERVICES  **PeiServices,
+  IN UINT32            BootMode
+  )
+{
+  UINT64  Size;
+  UINT64  MinSize;
 
   if (BootMode == BOOT_IN_RECOVERY_MODE) {
@@ -138 +139 @@
 EFIAPI
 PostFspmHobProcess (
-  IN VOID                 *FspHobList
-  )
-{
-  EFI_PEI_HOB_POINTERS Hob;
-  UINT64               LowMemorySize;
-  UINT64               FspMemorySize;
-  EFI_PHYSICAL_ADDRESS FspMemoryBase;
-  UINT64               PeiMemSize;
-  EFI_PHYSICAL_ADDRESS PeiMemBase;
-  UINT64               S3PeiMemSize;
-  EFI_PHYSICAL_ADDRESS S3PeiMemBase;
-  BOOLEAN              FoundFspMemHob;
-  EFI_STATUS           Status;
-  EFI_BOOT_MODE        BootMode;
-  EFI_PEI_CAPSULE_PPI  *Capsule;
-  VOID                 *CapsuleBuffer;
-  UINTN                CapsuleBufferLength;
-  UINT64               RequiredMemSize;
-  EFI_PEI_SERVICES     **PeiServices;
+  IN VOID  *FspHobList
+  )
+{
+  EFI_PEI_HOB_POINTERS  Hob;
+  UINT64                LowMemorySize;
+  UINT64                FspMemorySize;
+  EFI_PHYSICAL_ADDRESS  FspMemoryBase;
+  UINT64                PeiMemSize;
+  EFI_PHYSICAL_ADDRESS  PeiMemBase;
+  UINT64                S3PeiMemSize;
+  EFI_PHYSICAL_ADDRESS  S3PeiMemBase;
+  BOOLEAN               FoundFspMemHob;
+  EFI_STATUS            Status;
+  EFI_BOOT_MODE         BootMode;
+  EFI_PEI_CAPSULE_PPI   *Capsule;
+  VOID                  *CapsuleBuffer;
+  UINTN                 CapsuleBufferLength;
+  UINT64                RequiredMemSize;
+  EFI_PEI_SERVICES      **PeiServices;
 
   PeiServices = (EFI_PEI_SERVICES **)GetPeiServicesTablePointer ();
@@ -162 +163 @@
   PeiServicesGetBootMode (&BootMode);
 
-  PeiMemBase = 0;
-  LowMemorySize = 0;
-  FspMemorySize = 0;
-  FspMemoryBase = 0;
+  PeiMemBase     = 0;
+  LowMemorySize  = 0;
+  FspMemorySize  = 0;
+  FspMemoryBase  = 0;
   FoundFspMemHob = FALSE;
 
@@ -173 +174 @@
   //
   Hob.Raw = (UINT8 *)(UINTN)FspHobList;
-  DEBUG((DEBUG_INFO, "FspHobList - 0x%x\n", FspHobList));
+  DEBUG ((DEBUG_INFO, "FspHobList - 0x%x\n", FspHobList));
 
   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, Hob.Raw)) != NULL) {
-    DEBUG((DEBUG_INFO, "\nResourceType: 0x%x\n", Hob.ResourceDescriptor->ResourceType));
+    DEBUG ((DEBUG_INFO, "\nResourceType: 0x%x\n", Hob.ResourceDescriptor->ResourceType));
     if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) ||
-        (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED)) {
-      DEBUG((DEBUG_INFO, "ResourceAttribute: 0x%x\n", Hob.ResourceDescriptor->ResourceAttribute));
-      DEBUG((DEBUG_INFO, "PhysicalStart: 0x%x\n", Hob.ResourceDescriptor->PhysicalStart));
-      DEBUG((DEBUG_INFO, "ResourceLength: 0x%x\n", Hob.ResourceDescriptor->ResourceLength));
-      DEBUG((DEBUG_INFO, "Owner: %g\n\n", &Hob.ResourceDescriptor->Owner));
-    }
-
-    if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY)  // Found the low memory length below 4G
-        && (Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB)
-        && (Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength <= BASE_4GB)) {
-        LowMemorySize += Hob.ResourceDescriptor->ResourceLength;
-      Hob.Raw = GET_NEXT_HOB (Hob);
+        (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED))
+    {
+      DEBUG ((DEBUG_INFO, "ResourceAttribute: 0x%x\n", Hob.ResourceDescriptor->ResourceAttribute));
+      DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%x\n", Hob.ResourceDescriptor->PhysicalStart));
+      DEBUG ((DEBUG_INFO, "ResourceLength: 0x%x\n", Hob.ResourceDescriptor->ResourceLength));
+      DEBUG ((DEBUG_INFO, "Owner: %g\n\n", &Hob.ResourceDescriptor->Owner));
+    }
+
+    if (  (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) // Found the low memory length below 4G
+       && (Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB)
+       && (Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength <= BASE_4GB))
+    {
+      LowMemorySize += Hob.ResourceDescriptor->ResourceLength;
+      Hob.Raw        = GET_NEXT_HOB (Hob);
       continue;
     }
 
-    if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED)  // Found the low memory length below 4G
-        && (Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB)
-        && (Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength <= BASE_4GB)
-        && (CompareGuid (&Hob.ResourceDescriptor->Owner, &gFspReservedMemoryResourceHobGuid))) {
+    if (  (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) // Found the low memory length below 4G
+       && (Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB)
+       && (Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength <= BASE_4GB)
+       && (CompareGuid (&Hob.ResourceDescriptor->Owner, &gFspReservedMemoryResourceHobGuid)))
+    {
       FoundFspMemHob = TRUE;
-      FspMemoryBase = Hob.ResourceDescriptor->PhysicalStart;
-      FspMemorySize = Hob.ResourceDescriptor->ResourceLength;
-      DEBUG((DEBUG_INFO, "Find fsp mem hob, base 0x%x, len 0x%x\n", FspMemoryBase, FspMemorySize));
+      FspMemoryBase  = Hob.ResourceDescriptor->PhysicalStart;
+      FspMemorySize  = Hob.ResourceDescriptor->ResourceLength;
+      DEBUG ((DEBUG_INFO, "Find fsp mem hob, base 0x%x, len 0x%x\n", FspMemoryBase, FspMemorySize));
     }
 
@@ -217 +221 @@
 
   if (!FoundFspMemHob) {
-    DEBUG((DEBUG_INFO, "Didn't find the fsp used memory information.\n"));
-    //ASSERT(FALSE);
-  }
-
-  DEBUG((DEBUG_INFO, "LowMemorySize: 0x%x.\n", LowMemorySize));
-  DEBUG((DEBUG_INFO, "FspMemoryBase: 0x%x.\n", FspMemoryBase));
-  DEBUG((DEBUG_INFO, "FspMemorySize: 0x%x.\n", FspMemorySize));
+    DEBUG ((DEBUG_INFO, "Didn't find the fsp used memory information.\n"));
+    // ASSERT(FALSE);
+  }
+
+  DEBUG ((DEBUG_INFO, "LowMemorySize: 0x%x.\n", LowMemorySize));
+  DEBUG ((DEBUG_INFO, "FspMemoryBase: 0x%x.\n", FspMemoryBase));
+  DEBUG ((DEBUG_INFO, "FspMemorySize: 0x%x.\n", FspMemorySize));
 
   if (BootMode == BOOT_ON_S3_RESUME) {
@@ -229 +233 @@
       EFI_RESOURCE_SYSTEM_MEMORY,
       (
-         EFI_RESOURCE_ATTRIBUTE_PRESENT |
-         EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
-         // EFI_RESOURCE_ATTRIBUTE_TESTED |
-         EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE
+       EFI_RESOURCE_ATTRIBUTE_PRESENT |
+       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
+       // EFI_RESOURCE_ATTRIBUTE_TESTED |
+       EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE
       ),
       BASE_1MB,
@@ -243 +247 @@
     S3PeiMemBase = 0;
     S3PeiMemSize = 0;
-    Status = GetS3MemoryInfo (&S3PeiMemSize, &S3PeiMemBase);
+    Status       = GetS3MemoryInfo (&S3PeiMemSize, &S3PeiMemBase);
     ASSERT_EFI_ERROR (Status);
-    DEBUG((DEBUG_INFO, "S3 memory %Xh - %Xh bytes\n", S3PeiMemBase, S3PeiMemSize));
+    DEBUG ((DEBUG_INFO, "S3 memory %Xh - %Xh bytes\n", S3PeiMemBase, S3PeiMemSize));
 
     //
@@ -258 +262 @@
   } else {
     PeiMemSize = GetPeiMemSize (PeiServices, BootMode);
-    DEBUG((DEBUG_INFO, "PEI memory size = %Xh bytes\n", PeiMemSize));
+    DEBUG ((DEBUG_INFO, "PEI memory size = %Xh bytes\n", PeiMemSize));
 
     //
     // Capsule mode
     //
-    Capsule = NULL;
-    CapsuleBuffer = NULL;
+    Capsule             = NULL;
+    CapsuleBuffer       = NULL;
     CapsuleBufferLength = 0;
     if (BootMode == BOOT_ON_FLASH_UPDATE) {
@@ -271 +275 @@
                  0,
                  NULL,
-                 (VOID **) &Capsule
+                 (VOID **)&Capsule
                  );
       ASSERT_EFI_ERROR (Status);
@@ -279 +283 @@
         // Make sure Stack and CapsuleBuffer are not overlap
         //
-        CapsuleBuffer = (VOID *)(UINTN)BASE_1MB;
+        CapsuleBuffer       = (VOID *)(UINTN)BASE_1MB;
         CapsuleBufferLength = (UINTN)(LowMemorySize - PeiMemSize);
         //
@@ -289 +293 @@
 
     RequiredMemSize = RetrieveRequiredMemorySize (PeiServices);
-    DEBUG((DEBUG_INFO, "Required memory size = %Xh bytes\n", RequiredMemSize));
+    DEBUG ((DEBUG_INFO, "Required memory size = %Xh bytes\n", RequiredMemSize));
 
     //
@@ -297 +301 @@
       EFI_RESOURCE_SYSTEM_MEMORY,
       (
-         EFI_RESOURCE_ATTRIBUTE_PRESENT |
-         EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
-         EFI_RESOURCE_ATTRIBUTE_TESTED |
-         EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
-         EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE
+       EFI_RESOURCE_ATTRIBUTE_PRESENT |
+       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
+       EFI_RESOURCE_ATTRIBUTE_TESTED |
+       EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
+       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE
       ),
       BASE_1MB,
@@ -317 +321 @@
     //
     PeiMemBase = BASE_1MB + LowMemorySize - PeiMemSize;
-    Status = PeiServicesInstallPeiMemory (
-               PeiMemBase,
-               PeiMemSize - RequiredMemSize
-               );
+    Status     = PeiServicesInstallPeiMemory (
+                   PeiMemBase,
+                   PeiMemSize - RequiredMemSize
+                   );
     ASSERT_EFI_ERROR (Status);
 
@@ -339 +343 @@
 VOID
 ProcessFspHobList (
-  IN VOID                 *FspHobList
+  IN VOID  *FspHobList
   )
 {
@@ -354 +358 @@
       // Skip FSP binary creates PcdDataBaseHobGuid
       //
-      if (!CompareGuid(&FspHob.Guid->Name, &gPcdDataBaseHobGuid)) {
+      if (!CompareGuid (&FspHob.Guid->Name, &gPcdDataBaseHobGuid)) {
         BuildGuidDataHob (
           &FspHob.Guid->Name,
-          GET_GUID_HOB_DATA(FspHob),
-          GET_GUID_HOB_DATA_SIZE(FspHob)
-        );
+          GET_GUID_HOB_DATA (FspHob),
+          GET_GUID_HOB_DATA_SIZE (FspHob)
+          );
       }
     }
+
     FspHob.Raw = GET_NEXT_HOB (FspHob);
   }
@@ -376 +381 @@
 EFIAPI
 PostFspsHobProcess (
-  IN VOID                 *FspHobList
+  IN VOID  *FspHobList
   )
 {
@@ -393 +398 @@
     ProcessFspHobList (FspHobList);
   }
+
   return EFI_SUCCESS;
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c

@@ -30 +30 @@
 EFIAPI
 SecPlatformInformation (
-  IN CONST EFI_PEI_SERVICES                     **PeiServices,
-  IN OUT   UINT64                               *StructureSize,
-     OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord
+  IN CONST EFI_PEI_SERVICES                  **PeiServices,
+  IN OUT   UINT64                            *StructureSize,
+  OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord
   );
 
@@ -96 +96 @@
 EFIAPI
 SecPlatformMain (
-  IN OUT   EFI_SEC_PEI_HAND_OFF        *SecCoreData
+  IN OUT   EFI_SEC_PEI_HAND_OFF  *SecCoreData
   )
 {
-  EFI_PEI_PPI_DESCRIPTOR      *PpiList;
+  EFI_PEI_PPI_DESCRIPTOR  *PpiList;
 
-  DEBUG((DEBUG_INFO, "SecPlatformMain\n"));
+  DEBUG ((DEBUG_INFO, "SecPlatformMain\n"));
 
-  DEBUG((DEBUG_INFO, "BootFirmwareVolumeBase - 0x%x\n", SecCoreData->BootFirmwareVolumeBase));
-  DEBUG((DEBUG_INFO, "BootFirmwareVolumeSize - 0x%x\n", SecCoreData->BootFirmwareVolumeSize));
-  DEBUG((DEBUG_INFO, "TemporaryRamBase       - 0x%x\n", SecCoreData->TemporaryRamBase));
-  DEBUG((DEBUG_INFO, "TemporaryRamSize       - 0x%x\n", SecCoreData->TemporaryRamSize));
-  DEBUG((DEBUG_INFO, "PeiTemporaryRamBase    - 0x%x\n", SecCoreData->PeiTemporaryRamBase));
-  DEBUG((DEBUG_INFO, "PeiTemporaryRamSize    - 0x%x\n", SecCoreData->PeiTemporaryRamSize));
-  DEBUG((DEBUG_INFO, "StackBase              - 0x%x\n", SecCoreData->StackBase));
-  DEBUG((DEBUG_INFO, "StackSize              - 0x%x\n", SecCoreData->StackSize));
+  DEBUG ((DEBUG_INFO, "BootFirmwareVolumeBase - 0x%x\n", SecCoreData->BootFirmwareVolumeBase));
+  DEBUG ((DEBUG_INFO, "BootFirmwareVolumeSize - 0x%x\n", SecCoreData->BootFirmwareVolumeSize));
+  DEBUG ((DEBUG_INFO, "TemporaryRamBase       - 0x%x\n", SecCoreData->TemporaryRamBase));
+  DEBUG ((DEBUG_INFO, "TemporaryRamSize       - 0x%x\n", SecCoreData->TemporaryRamSize));
+  DEBUG ((DEBUG_INFO, "PeiTemporaryRamBase    - 0x%x\n", SecCoreData->PeiTemporaryRamBase));
+  DEBUG ((DEBUG_INFO, "PeiTemporaryRamSize    - 0x%x\n", SecCoreData->PeiTemporaryRamSize));
+  DEBUG ((DEBUG_INFO, "StackBase              - 0x%x\n", SecCoreData->StackBase));
+  DEBUG ((DEBUG_INFO, "StackSize              - 0x%x\n", SecCoreData->StackSize));
 
-  InitializeApicTimer (0, (UINT32) -1, TRUE, 5);
+  InitializeApicTimer (0, (UINT32)-1, TRUE, 5);
 
   //
@@ -119 +119 @@
   //
   PpiList = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + (UINTN)SecCoreData->PeiTemporaryRamSize/2);
-  CopyMem (PpiList, mPeiSecPlatformPpi, sizeof(mPeiSecPlatformPpi));
+  CopyMem (PpiList, mPeiSecPlatformPpi, sizeof (mPeiSecPlatformPpi));
 
   //

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Stack.nasm

@@ -1 +1 @@
 ;------------------------------------------------------------------------------
 ;
-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>
 ; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
@@ -23 +23 @@
 ASM_PFX(SecSwitchStack):
     ;
-    ; Save three register: eax, ebx, ecx
+    ; Save four register: eax, ebx, ecx, edx
     ;
     push  eax
@@ -56 +56 @@
     mov   edx, dword [esp + 16]    ; Update this function's return address into permanent memory
     mov   dword [eax + 16], edx
-    mov   esp, eax                     ; From now, esp is pointed to permanent memory
+    mov   esp, eax                 ; From now, esp is pointed to permanent memory
 
     ;
@@ -64 +64 @@
     sub   eax, ebx
     add   eax, ecx
-    mov   ebp, eax                ; From now, ebp is pointed to permanent memory
+    mov   ebp, eax                 ; From now, ebp is pointed to permanent memory
 
     pop   edx

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c

@@ -6 +6 @@
 
 **/
-
 
 #include <PiPei.h>
@@ -22 +21 @@
 EFIAPI
 PlatformInit (
-  IN VOID                 *FspHobList,
-  IN VOID                 *StartOfRange,
-  IN VOID                 *EndOfRange
+  IN VOID  *FspHobList,
+  IN VOID  *StartOfRange,
+  IN VOID  *EndOfRange
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspWrapperPlatformSecLibSample.inf

@@ -2 +2 @@
 #  Sample to provide FSP wrapper platform sec related function.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -40 +40 @@
   SecTempRamDone.c
   PlatformInit.c
+  Fsp.h
 
 [Sources.IA32]
-  Ia32/Fsp.h
   Ia32/SecEntry.nasm
   Ia32/PeiCoreEntry.nasm
   Ia32/Stack.nasm
+
+[Sources.X64]
+  X64/SecEntry.nasm
+  X64/PeiCoreEntry.nasm
+  X64/Stack.nasm
 
 ################################################################################
@@ -77 +82 @@
 
 [FixedPcd]
-  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress     ## CONSUMES
-  gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize  ## CONSUMES
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset         ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress           ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize        ## CONSUMES
   gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress        ## CONSUMES
   gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize           ## CONSUMES

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c

@@ -54 +54 @@
                              0,
                              NULL,
-                             (VOID **) &TopOfTemporaryRamPpi
+                             (VOID **)&TopOfTemporaryRamPpi
                              );
   if (EFI_ERROR (Status)) {
@@ -73 +73 @@
   // |--------------|
   //
-  TopOfTemporaryRam = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof(UINT32);
-  TopOfTemporaryRam -= sizeof(UINT32) * 2;
-  Count             = *(UINT32 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32));
-  Size              = Count * sizeof (UINT64);
+  TopOfTemporaryRam  = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);
+  TopOfTemporaryRam -= sizeof (UINT32) * 2;
+  Count              = *(UINT32 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32));
+  Size               = Count * sizeof (UINT64);
 
-  Ticker = *(UINT64 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32) - Size - sizeof (UINT32) * 2);
+  Ticker                = *(UINT64 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32) - Size - sizeof (UINT32) * 2);
   Performance->ResetEnd = GetTimeInNanoSecond (Ticker);
 

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c

@@ -29 +29 @@
 EFIAPI
 SecPlatformInformation (
-  IN CONST EFI_PEI_SERVICES                     **PeiServices,
-  IN OUT   UINT64                               *StructureSize,
-     OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord
+  IN CONST EFI_PEI_SERVICES                  **PeiServices,
+  IN OUT   UINT64                            *StructureSize,
+  OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord
   )
 {
@@ -48 +48 @@
                              0,
                              NULL,
-                             (VOID **) &TopOfTemporaryRamPpi
+                             (VOID **)&TopOfTemporaryRamPpi
                              );
   if (EFI_ERROR (Status)) {
@@ -60 +60 @@
   // PlatformInformationRecord for output.
   //
-  TopOfTemporaryRam = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);
-  TopOfTemporaryRam -= sizeof(UINT32) * 2;
-  Count             = *((UINT32 *)(UINTN) (TopOfTemporaryRam - sizeof (UINT32)));
-  Size              = Count * sizeof (IA32_HANDOFF_STATUS);
+  TopOfTemporaryRam  = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);
+  TopOfTemporaryRam -= sizeof (UINT32) * 2;
+  Count              = *((UINT32 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32)));
+  Size               = Count * sizeof (IA32_HANDOFF_STATUS);
 
-  if ((*StructureSize) < (UINT64) Size) {
+  if ((*StructureSize) < (UINT64)Size) {
     *StructureSize = Size;
     return EFI_BUFFER_TOO_SMALL;
   }
 
-  *StructureSize  = Size;
-  Bist            = (UINT32 *) (TopOfTemporaryRam - sizeof (UINT32) - Size);
+  *StructureSize = Size;
+  Bist           = (UINT32 *)(TopOfTemporaryRam - sizeof (UINT32) - Size);
 
   CopyMem (PlatformInformationRecord, Bist, Size);

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c

@@ -2 +2 @@
   Sample to provide TempRamInitParams data.
 
-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -11 +11 @@
 
 typedef struct {
-  UINT32                      MicrocodeRegionBase;
-  UINT32                      MicrocodeRegionSize;
-  UINT32                      CodeRegionBase;
-  UINT32                      CodeRegionSize;
+  EFI_PHYSICAL_ADDRESS    MicrocodeRegionBase;
+  UINT64                  MicrocodeRegionSize;
+  EFI_PHYSICAL_ADDRESS    CodeRegionBase;
+  UINT64                  CodeRegionSize;
 } FSPT_CORE_UPD;
 
@@ -20 +20 @@
   FSP_UPD_HEADER    FspUpdHeader;
   //
-  // If platform does not support FSP spec 2.2 remove FSPT_ARCH_UPD structure.
+  // If FSP spec version < 2.2, remove FSPT_ARCH_UPD structure.
+  // Else If FSP spec version >= 2.2 and FSP spec version < 2.4, use FSPT_ARCH_UPD structure.
+  // Else, use FSPT_ARCH2_UPD structure.
   //
-  FSPT_ARCH_UPD     FsptArchUpd;
+  FSPT_ARCH2_UPD    FsptArchUpd;
   FSPT_CORE_UPD     FsptCoreUpd;
 } FSPT_UPD_CORE_DATA;
 
-GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA FsptUpdDataPtr = {
+GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA  FsptUpdDataPtr = {
   {
     0x4450555F54505346,
@@ -34 +36 @@
     0x02,
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    }
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
   },
   //
-  // If platform does not support FSP spec 2.2 remove FSPT_ARCH_UPD structure.
+  // If FSP spec version < 2.2, remove FSPT_ARCH_UPD structure.
+  // Else If FSP spec version >= 2.2 and FSP spec version < 2.4, use FSPT_ARCH_UPD structure.
+  // Else, use FSPT_ARCH2_UPD structure.
   //
   {
-    0x01,
+    0x02,
     {
       0x00, 0x00, 0x00
@@ -49 +52 @@
     {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     }
   },
   {
-    ((UINT32)FixedPcdGet64 (PcdCpuMicrocodePatchAddress) + FixedPcdGet32 (PcdFlashMicrocodeOffset)),
-    ((UINT32)FixedPcdGet64 (PcdCpuMicrocodePatchRegionSize) - FixedPcdGet32 (PcdFlashMicrocodeOffset)),
+    FixedPcdGet32 (PcdCpuMicrocodePatchAddress),
+    FixedPcdGet32 (PcdCpuMicrocodePatchRegionSize),
     FixedPcdGet32 (PcdFlashCodeCacheAddress),
     FixedPcdGet32 (PcdFlashCodeCacheSize),
   }
 };
-

trunk/src/VBox/Devices/EFI/FirmwareNew/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c

@@ -24 +24 @@
   )
 {
-  EFI_STATUS                Status;
-  VOID                      *TempRamExitParam;
-  FSP_INFO_HEADER           *FspHeader;
+  EFI_STATUS       Status;
+  VOID             *TempRamExitParam;
+  FSP_INFO_HEADER  *FspHeader;
 
-  FspHeader = FspFindFspHeader (PcdGet32(PcdFspmBaseAddress));
+  FspHeader = FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
   if (FspHeader == NULL) {
-    return ;
+    return;
   }
 
-  DEBUG((DEBUG_INFO, "SecPlatformDisableTemporaryMemory enter\n"));
+  DEBUG ((DEBUG_INFO, "SecPlatformDisableTemporaryMemory enter\n"));
 
   TempRamExitParam = UpdateTempRamExitParam ();
-  Status = CallTempRamExit (TempRamExitParam);
-  DEBUG((DEBUG_INFO, "TempRamExit status: 0x%x\n", Status));
-  ASSERT_EFI_ERROR(Status);
+  Status           = CallTempRamExit (TempRamExitParam);
+  DEBUG ((DEBUG_INFO, "TempRamExit status: 0x%x\n", Status));
+  ASSERT_EFI_ERROR (Status);
 
-  return ;
+  return;
 }