OvmfPkg/Xen: use lower case x in hex immediate value

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 210578796129925f54a8dccd27dafd56ebdbef1a..9970d1479e611b7fb574ca22034702e2b82add71 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
@@ -249,9 +247,11 @@ MiscInitialization (
   IoOr8 (0x92, BIT1);\r
 \r
   //\r
-  // Build the CPU hob with 36-bit addressing and 16-bits of IO space.\r
+  // Build the CPU HOB with guest RAM size dependent address width and 16-bits\r
+  // of IO space. (Side note: unlike other HOBs, the CPU HOB is needed during\r
+  // S3 resume as well, so we build it unconditionally.)\r
   //\r
-  BuildCpuHob (36, 16);\r
+  BuildCpuHob (mPhysMemAddressWidth, 16);\r
 \r
   //\r
   // Determine platform type and save Host Bridge DID to PCD\r
@@ -363,7 +363,7 @@ DebugDumpCmos (
   VOID\r
   )\r
 {\r
-  UINTN  Loop;\r
+  UINT32 Loop;\r
 \r
   DEBUG ((EFI_D_INFO, "CMOS:\n"));\r
 \r
@@ -379,41 +379,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
@@ -442,6 +407,7 @@ InitializePlatform (
   }\r
 \r
   BootModeInitialization ();\r
+  AddressWidthInitialization ();\r
 \r
   PublishPeiMemory ();\r
 \r
@@ -463,8 +429,6 @@ InitializePlatform (
     PeiFvInitialization ();\r
 \r
     MemMapInitialization ();\r
-\r
-    SmbiosVersionInitialization ();\r
   }\r
 \r
   MiscInitialization ();\r