PXE driver bug fix.

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 90be3c33ad0dbce1283bc5c22787a9812d65d720..1940e01640fd177aa5646ed7b7ed07e96fd11c73 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -30,10 +30,12 @@
 #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 <IndustryStandard/Pci22.h>\r
+#include <OvmfPlatforms.h>\r
 \r
 #include "Platform.h"\r
 #include "Cmos.h"\r
@@ -59,6 +61,11 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
 };\r
 \r
 \r
+EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
+\r
+BOOLEAN mS3Supported = FALSE;\r
+\r
+\r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
   EFI_PHYSICAL_ADDRESS        MemoryBase,\r
@@ -213,8 +220,6 @@ MemMapInitialization (
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);\r
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);\r
     AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
-  } else {\r
-    XenPublishRamRegions ();\r
   }\r
 }\r
 \r
@@ -224,6 +229,11 @@ MiscInitialization (
   VOID\r
   )\r
 {\r
+  UINT16 HostBridgeDevId;\r
+  UINTN  PmCmd;\r
+  UINTN  Pmba;\r
+  UINTN  PmRegMisc;\r
+\r
   //\r
   // Disable A20 Mask\r
   //\r
@@ -234,45 +244,66 @@ MiscInitialization (
   //\r
   BuildCpuHob (36, 16);\r
 \r
+  //\r
+  // Query Host Bridge DID to determine platform type and save to PCD\r
+  //\r
+  HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
+  switch (HostBridgeDevId) {\r
+    case INTEL_82441_DEVICE_ID:\r
+      PmCmd     = POWER_MGMT_REGISTER_PIIX4 (PCI_COMMAND_OFFSET);\r
+      Pmba      = POWER_MGMT_REGISTER_PIIX4 (0x40);\r
+      PmRegMisc = POWER_MGMT_REGISTER_PIIX4 (0x80);\r
+      break;\r
+    case INTEL_Q35_MCH_DEVICE_ID:\r
+      PmCmd     = POWER_MGMT_REGISTER_Q35 (PCI_COMMAND_OFFSET);\r
+      Pmba      = POWER_MGMT_REGISTER_Q35 (0x40);\r
+      PmRegMisc = POWER_MGMT_REGISTER_Q35 (0x80);\r
+      break;\r
+    default:\r
+      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__, HostBridgeDevId));\r
+      ASSERT (FALSE);\r
+      return;\r
+  }\r
+  PcdSet16 (PcdOvmfHostBridgePciDevId, HostBridgeDevId);\r
+\r
   //\r
   // If PMREGMISC/PMIOSE is set, assume the ACPI PMBA has been configured (for\r
   // example by Xen) and skip the setup here. This matches the logic in\r
   // AcpiTimerLibConstructor ().\r
   //\r
-  if ((PciRead8 (PCI_LIB_ADDRESS (0, 1, 3, 0x80)) & 0x01) == 0) {\r
+  if ((PciRead8 (PmRegMisc) & 0x01) == 0) {\r
     //\r
     // The PEI phase should be exited with fully accessibe PIIX4 IO space:\r
     // 1. set PMBA\r
     //\r
-    PciAndThenOr32 (\r
-      PCI_LIB_ADDRESS (0, 1, 3, 0x40),\r
-      (UINT32) ~0xFFC0,\r
-      PcdGet16 (PcdAcpiPmBaseAddress)\r
-      );\r
+    PciAndThenOr32 (Pmba, (UINT32) ~0xFFC0, PcdGet16 (PcdAcpiPmBaseAddress));\r
 \r
     //\r
     // 2. set PCICMD/IOSE\r
     //\r
-    PciOr8 (\r
-      PCI_LIB_ADDRESS (0, 1, 3, PCI_COMMAND_OFFSET),\r
-      EFI_PCI_COMMAND_IO_SPACE\r
-      );\r
+    PciOr8 (PmCmd, EFI_PCI_COMMAND_IO_SPACE);\r
 \r
     //\r
     // 3. set PMREGMISC/PMIOSE\r
     //\r
-    PciOr8 (PCI_LIB_ADDRESS (0, 1, 3, 0x80), 0x01);\r
+    PciOr8 (PmRegMisc, 0x01);\r
   }\r
 }\r
 \r
 \r
 VOID\r
 BootModeInitialization (\r
+  VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS    Status;\r
+\r
+  if (CmosRead8 (0xF) == 0xFE) {\r
+    mBootMode = BOOT_ON_S3_RESUME;\r
+  }\r
 \r
-  Status = PeiServicesSetBootMode (BOOT_WITH_FULL_CONFIGURATION);\r
+  Status = PeiServicesSetBootMode (mBootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesInstallPpi (mPpiBootMode);\r
@@ -350,24 +381,29 @@ InitializePlatform (
 \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
 \r
-  if (!mXen) {\r
-    InitializeRamRegions ();\r
-  }\r
+  InitializeRamRegions ();\r
 \r
   if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
     InitializeXen ();\r
   }\r
 \r
-  ReserveEmuVariableNvStore ();\r
+  if (mBootMode != BOOT_ON_S3_RESUME) {\r
+    ReserveEmuVariableNvStore ();\r
 \r
-  PeiFvInitialization ();\r
+    PeiFvInitialization ();\r
 \r
-  MemMapInitialization ();\r
+    MemMapInitialization ();\r
+  }\r
 \r
   MiscInitialization ();\r
 \r