OvmfPkg/PlatformPei: Detect S3 support for QEMU / KVM

QEMU indicates whether S3 is supported or not in the
fw-cfg interface.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15293 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 3e69d923d4215a4f79793b88dfb1de75ca1de25f..00c688d68a9142284b422b80d062f7c7abc0e657 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -30,6 +30,7 @@
 #include <Library/PciLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PciLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/PeiServicesLib.h>\r

+#include <Library/QemuFwCfgLib.h>\r

 #include <Library/ResourcePublicationLib.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Ppi/MasterBootMode.h>\r
 #include <Library/ResourcePublicationLib.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Ppi/MasterBootMode.h>\r


@@ -61,6 +62,8 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
 \r
 EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
 \r
 \r
 EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
 \r

+BOOLEAN mS3Supported = FALSE;\r
+\r

 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r


@@ -356,6 +359,11 @@ InitializePlatform (
 \r
   XenDetect ();\r
 \r
 \r
   XenDetect ();\r
 \r

+  if (QemuFwCfgS3Enabled ()) {\r
+    DEBUG ((EFI_D_INFO, "S3 support was detected on QEMU\n"));\r
+    mS3Supported = TRUE;\r
+  }\r
+\r

   BootModeInitialization ();\r
 \r
   PublishPeiMemory ();\r
   BootModeInitialization ();\r
 \r
   PublishPeiMemory ();\r

diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
index 9ed712f3cd26d846ef0892e5fa1b0128cf21f41f..31640e9b30be69c2406bb0f4e5b7e8e98e4db33c 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.h
+++ b/OvmfPkg/PlatformPei/Platform.h
@@ -98,4 +98,6 @@ XenPublishRamRegions (
 \r
 extern EFI_BOOT_MODE mBootMode;\r
 \r
 \r
 extern EFI_BOOT_MODE mBootMode;\r
 \r

+extern BOOLEAN mS3Supported;\r
+\r

 #endif // _PLATFORM_PEI_H_INCLUDED_\r
 #endif // _PLATFORM_PEI_H_INCLUDED_\r

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 7c646ab8a01279138c44952621173dfeeeae1990..ad620350a2939e6f3f155cca4ad2d363cdd0058f 100644 (file)
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -54,6 +54,7 @@
   PeiServicesLib\r
   PeiServicesTablePointerLib\r
   PeimEntryPoint\r
   PeiServicesLib\r
   PeiServicesTablePointerLib\r
   PeimEntryPoint\r

+  QemuFwCfgLib\r

   MtrrLib\r
   PcdLib\r
 \r
   MtrrLib\r
   PcdLib\r
 \r