Changeset 77795 in vbox for trunk/src/VBox

Timestamp:

Mar 19, 2019 4:26:01 PM (6 years ago)

Author:

vboxsync

Message:

EFI: More hacks to handle the case where ICH9 chipset gets some random device at 0:0.0 rather than having that slot empty.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg

Files:

• Library/AcpiTimerLib/BaseAcpiTimerLib.c (modified) (3 diffs)
• Library/AcpiTimerLib/BaseRomAcpiTimerLib.c (modified) (3 diffs)
• Library/AcpiTimerLib/DxeAcpiTimerLib.c (modified) (3 diffs)
• PlatformPei/Platform.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c

@@ -51 +51 @@
 #ifdef VBOX
     // HACK ALERT! There is no host bridge device in the PCIe chipset, and the same PIIX4 PM device is used.
-    case 0xffff:
+    // But there might be some other device at 0:0.0.
+    default:
 #endif
       Pmba       = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);
@@ -66 +67 @@
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;
       break;
+#ifndef VBOX
     default:
       DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
@@ -71 +73 @@
       ASSERT (FALSE);
       return RETURN_UNSUPPORTED;
+#endif
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c

@@ -49 +49 @@
 #ifdef VBOX
     // HACK ALERT! There is no host bridge device in the PCIe chipset, and the same PIIX4 PM device is used.
-    case 0xffff:
+    // But there might be some other device at 0:0.0.
+    default:
 #endif
       Pmba       = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);
@@ -64 +65 @@
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;
       break;
+#ifndef VBOX
     default:
       DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
@@ -69 +71 @@
       ASSERT (FALSE);
       return RETURN_UNSUPPORTED;
+#endif
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c

@@ -52 +52 @@
   switch (HostBridgeDevId) {
 #ifdef VBOX
-    // HACK ALERT! In the PCIe chipset, the same PIIX4 PM device is used.
-    case INTEL_Q35_MCH_DEVICE_ID:
+      // HACK ALERT! There is no host bridge device in the PCIe chipset, and the same PIIX4 PM device is used.
+      // But there might be some other device at 0:0.0.
+    default:
 #endif
     case INTEL_82441_DEVICE_ID:
@@ -62 +63 @@
       Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
       break;
-#endif
     default:
       DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
@@ -68 +68 @@
       ASSERT (FALSE);
       return RETURN_UNSUPPORTED;
+#endif
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/Platform.c

@@ -520 +520 @@
   //
   switch (mHostBridgeDevId) {
+#ifdef VBOX
+    // This is really hacky but so it goes. The PCIe chipset might have nothing at 0:0.0,
+    // or it might be some random device. But it's not going to be the 440FX host bridge.
+    default:
+#endif
     case INTEL_82441_DEVICE_ID:
       PmCmd      = POWER_MGMT_REGISTER_PIIX4 (PCI_COMMAND_OFFSET);
@@ -528 +533 @@
       AcpiEnBit  = PIIX4_PMREGMISC_PMIOSE;
       break;
+#ifndef VBOX
     case INTEL_Q35_MCH_DEVICE_ID:
       PmCmd      = POWER_MGMT_REGISTER_Q35 (PCI_COMMAND_OFFSET);
@@ -541 +547 @@
       ASSERT (FALSE);
       return;
-  }
+#endif
+  }
+
+#ifdef VBOX
+  // If it's not 440FX, it must be the PCIe chipset.
+  if (mHostBridgeDevId != INTEL_82441_DEVICE_ID)
+      mHostBridgeDevId = INTEL_Q35_MCH_DEVICE_ID;
+
+#endif
   PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);
   ASSERT_RETURN_ERROR (PcdStatus);
@@ -760 +774 @@
 #ifdef VBOX
   // HACK ALERT! There is no host bridge device in the PCIe chipset, but we pretend it's a 3 Series chip.
-  if (mHostBridgeDevId == 0xffff)
+  // There may or not be some device at 0:0.0 so anything not 440FX must be PCIe.
+  if (mHostBridgeDevId != INTEL_82441_DEVICE_ID)
         mHostBridgeDevId = INTEL_Q35_MCH_DEVICE_ID;
 #endif