Changeset 36116 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Mar 1, 2011 12:30:42 PM (14 years ago)

Author:

vboxsync

Message:

ICH9/PciBridge: Use the secondary bus number during device init and fix sub class code for the PCI2Host bridge

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1531 +1531 @@
 static void ich9pciBiosInitBridge(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn)
 {
-    Log(("BIOS init device: %0x2::%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
+    Log(("BIOS init bridge: %02x::%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
 
     /*
@@ -1556 +1556 @@
     uint32_t u32IoAddressBase = pGlobals->uPciBiosIo;
     uint32_t u32MMIOAddressBase = pGlobals->uPciBiosMmio;
+    uint8_t uBridgeBus = ich9pciConfigRead(pGlobals, uBus, uDevFn, VBOX_PCI_SECONDARY_BUS, 1);
 
     /* Init devices behind the bridge and possibly other bridges as well. */
     for (int iDev = 0; iDev <= 255; iDev++)
-        ich9pciBiosInitDevice(pGlobals, uBus + 1, iDev);
+        ich9pciBiosInitDevice(pGlobals, uBridgeBus, iDev);
 
     /*
@@ -1607 +1608 @@
     if (uVendor == 0xffff)
         return;
+
+    Log(("BIOS init device: %02x::%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
 
     switch (uDevClass)
@@ -2441 +2444 @@
     PCIDevSetRevisionId(&pBus->aPciDev,   0x92); /* rev. A2 */
     PCIDevSetClassBase( &pBus->aPciDev,   0x06); /* bridge */
-    PCIDevSetClassSub(  &pBus->aPciDev,   0x04); /* Host/PCI bridge */
+    PCIDevSetClassSub(  &pBus->aPciDev,   0x00); /* Host/PCI bridge */
     PCIDevSetClassProg( &pBus->aPciDev,   0x01); /* Supports subtractive decoding. */
     PCIDevSetHeaderType(&pBus->aPciDev,   0x01); /* bridge */