OvmfPkg/PlatformPei: Allocate PEI FV as ACPI NVS if S3 is supported

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

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 11c79687c435da5fcccaa962660b5119540aba39..37030e6898390fcbd2e88ffe5d71363f546ba1b3 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -147,18 +147,22 @@ QemuInitializeRam (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();\r
 \r
-  //\r
-  // Create memory HOBs\r
-  //\r
-  AddMemoryRangeHob (BASE_1MB, LowerMemorySize);\r
-  AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);\r
+  if (mBootMode != BOOT_ON_S3_RESUME) {\r
+    //\r
+    // Create memory HOBs\r
+    //\r
+    AddMemoryRangeHob (BASE_1MB, LowerMemorySize);\r
+    AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);\r
+  }\r
 \r
   MtrrSetMemoryAttribute (BASE_1MB, LowerMemorySize - BASE_1MB, CacheWriteBack);\r
 \r
   MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);\r
 \r
   if (UpperMemorySize != 0) {\r
-    AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);\r
+    if (mBootMode != BOOT_ON_S3_RESUME) {\r
+      AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);\r
+    }\r
 \r
     MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
   }\r
@@ -188,5 +192,30 @@ InitializeRamRegions (
       (UINT64)(UINTN) PcdGet32 (PcdS3AcpiReservedMemorySize),\r
       EfiACPIMemoryNVS\r
       );\r
+\r
+    //\r
+    // Cover the initial RAM area used as stack and temporary PEI heap.\r
+    //\r
+    // This is reserved as ACPI NVS so it can be used on S3 resume.\r
+    //\r
+    BuildMemoryAllocationHob (\r
+      PcdGet32 (PcdOvmfSecPeiTempRamBase),\r
+      PcdGet32 (PcdOvmfSecPeiTempRamSize),\r
+      EfiACPIMemoryNVS\r
+      );\r
+\r
+#ifdef MDE_CPU_X64\r
+    //\r
+    // Reserve the initial page tables built by the reset vector code.\r
+    //\r
+    // Since this memory range will be used by the Reset Vector on S3\r
+    // resume, it must be reserved as ACPI NVS.\r
+    //\r
+    BuildMemoryAllocationHob (\r
+      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecPageTablesBase),\r
+      (UINT64)(UINTN) PcdGet32 (PcdOvmfSecPageTablesSize),\r
+      EfiACPIMemoryNVS\r
+      );\r
+#endif\r
   }\r
 }\r