OvmfPkg/PlatformPei: Add mBootMode driver variable

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 90be3c33ad0dbce1283bc5c22787a9812d65d720..3e69d923d4215a4f79793b88dfb1de75ca1de25f 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -59,6 +59,9 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
 };\r
 \r
 \r
 };\r
 \r
 \r

+EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
+\r
+\r

 VOID\r
 AddIoMemoryBaseSizeHob (\r
   EFI_PHYSICAL_ADDRESS        MemoryBase,\r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
   EFI_PHYSICAL_ADDRESS        MemoryBase,\r


@@ -213,8 +216,6 @@ MemMapInitialization (
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);\r
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);\r
     AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);\r
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);\r
     AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r

-  } else {\r
-    XenPublishRamRegions ();\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -268,11 +269,16 @@ MiscInitialization (
 \r
 VOID\r
 BootModeInitialization (\r
 \r
 VOID\r
 BootModeInitialization (\r

+  VOID\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS Status;\r
+  EFI_STATUS    Status;\r

 \r
 \r

-  Status = PeiServicesSetBootMode (BOOT_WITH_FULL_CONFIGURATION);\r
+  if (CmosRead8 (0xF) == 0xFE) {\r
+    mBootMode = BOOT_ON_S3_RESUME;\r
+  }\r
+\r
+  Status = PeiServicesSetBootMode (mBootMode);\r

   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesInstallPpi (mPpiBootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesInstallPpi (mPpiBootMode);\r


@@ -354,9 +360,7 @@ InitializePlatform (
 \r
   PublishPeiMemory ();\r
 \r
 \r
   PublishPeiMemory ();\r
 \r

-  if (!mXen) {\r
-    InitializeRamRegions ();\r
-  }\r
+  InitializeRamRegions ();\r

 \r
   if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
 \r
   if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r