OvmfPkg/PlatformPei: sync AmdSevInitialize() definition with declaration

[mirror_edk2.git] / OvmfPkg / PlatformPei / Platform.c

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 5e983a8dcea9bb9f79fcd7d255866315f22ad517..5a78668126b4cc70eaf0aab84ed062d33928d0ca 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -504,7 +504,6 @@ ReserveEmuVariableNvStore (
 {\r
   EFI_PHYSICAL_ADDRESS VariableStore;\r
   RETURN_STATUS        PcdStatus;\r
-  UINT32               Alignment;\r
 \r
   //\r
   // Allocate storage for NV variables early on so it will be\r
@@ -512,26 +511,15 @@ ReserveEmuVariableNvStore (
   // across reboots, this allows the NV variable storage to survive\r
   // a VM reboot.\r
   //\r
-  Alignment = PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
-  if ((Alignment & (Alignment - 1)) != 0) {\r
-    //\r
-    // Round up Alignment to the next power of two.\r
-    //\r
-    Alignment = GetPowerOfTwo32 (Alignment) << 1;\r
-  }\r
-\r
   VariableStore =\r
     (EFI_PHYSICAL_ADDRESS)(UINTN)\r
-      AllocateAlignedRuntimePages (\r
-        EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)),\r
-        Alignment\r
+      AllocateRuntimePages (\r
+        EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
         );\r
   DEBUG ((EFI_D_INFO,\r
-          "Reserved variable store memory: 0x%lX; size: %dkb, "\r
-          "alignment: 0x%x\n",\r
+          "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
           VariableStore,\r
-          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024,\r
-          Alignment\r
+          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
         ));\r
   PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
@@ -639,7 +627,7 @@ InitializePlatform (
 {\r
   EFI_STATUS    Status;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Platform PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n"));\r
 \r
   DebugDumpCmos ();\r
 \r
@@ -657,6 +645,15 @@ InitializePlatform (
   AddressWidthInitialization ();\r
   MaxCpuCountInitialization ();\r
 \r
+  //\r
+  // Query Host Bridge DID\r
+  //\r
+  mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
+\r
+  if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
+    Q35TsegMbytesInitialization ();\r
+  }\r
+\r
   PublishPeiMemory ();\r
 \r
   InitializeRamRegions ();\r
@@ -666,18 +663,16 @@ InitializePlatform (
     InitializeXen ();\r
   }\r
 \r
-  //\r
-  // Query Host Bridge DID\r
-  //\r
-  mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
-\r
   if (mBootMode != BOOT_ON_S3_RESUME) {\r
-    ReserveEmuVariableNvStore ();\r
+    if (!FeaturePcdGet (PcdSmmSmramRequire)) {\r
+      ReserveEmuVariableNvStore ();\r
+    }\r
     PeiFvInitialization ();\r
     MemMapInitialization ();\r
     NoexecDxeInitialization ();\r
   }\r
 \r
+  AmdSevInitialize ();\r
   MiscInitialization ();\r
   InstallFeatureControlCallback ();\r
 \r