OvmfPkg: PlatformPei: clear CMOS 0xF after setting mBootMode

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 87c51d7a9cc97d5415b12d8d9b250c5fde5fd312..2cc4c7e973627e2b3ad8d98d276abd8c9ff57241 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -32,11 +32,9 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
 #include <Library/ResourcePublicationLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Ppi/MasterBootMode.h>\r
 #include <IndustryStandard/Pci22.h>\r
-#include <IndustryStandard/SmBios.h>\r
 #include <OvmfPlatforms.h>\r
 \r
 #include "Platform.h"\r
@@ -324,6 +322,7 @@ BootModeInitialization (
   if (CmosRead8 (0xF) == 0xFE) {\r
     mBootMode = BOOT_ON_S3_RESUME;\r
   }\r
+  CmosWrite8 (0xF, 0x00);\r
 \r
   Status = PeiServicesSetBootMode (mBootMode);\r
   ASSERT_EFI_ERROR (Status);\r
@@ -381,41 +380,6 @@ DebugDumpCmos (
 }\r
 \r
 \r
-/**\r
-  Set the SMBIOS entry point version for the generic SmbiosDxe driver.\r
-**/\r
-STATIC\r
-VOID\r
-SmbiosVersionInitialization (\r
-  VOID\r
-  )\r
-{\r
-  FIRMWARE_CONFIG_ITEM     Anchor;\r
-  UINTN                    AnchorSize;\r
-  SMBIOS_TABLE_ENTRY_POINT QemuAnchor;\r
-  UINT16                   SmbiosVersion;\r
-\r
-  if (RETURN_ERROR (QemuFwCfgFindFile ("etc/smbios/smbios-anchor", &Anchor,\r
-                      &AnchorSize)) ||\r
-      AnchorSize != sizeof QemuAnchor) {\r
-    return;\r
-  }\r
-\r
-  QemuFwCfgSelectItem (Anchor);\r
-  QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);\r
-  if (CompareMem (QemuAnchor.AnchorString, "_SM_", 4) != 0 ||\r
-      CompareMem (QemuAnchor.IntermediateAnchorString, "_DMI_", 5) != 0) {\r
-    return;\r
-  }\r
-\r
-  SmbiosVersion = (UINT16)(QemuAnchor.MajorVersion << 8 |\r
-                           QemuAnchor.MinorVersion);\r
-  DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,\r
-    SmbiosVersion));\r
-  PcdSet16 (PcdSmbiosVersion, SmbiosVersion);\r
-}\r
-\r
-\r
 /**\r
   Perform Platform PEI initialization.\r
 \r
@@ -466,8 +430,6 @@ InitializePlatform (
     PeiFvInitialization ();\r
 \r
     MemMapInitialization ();\r
-\r
-    SmbiosVersionInitialization ();\r
   }\r
 \r
   MiscInitialization ();\r