Changeset 43441 in vbox for trunk/src/VBox

Timestamp:

Sep 26, 2012 1:07:32 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80951

Message:

ICH9: Fix PCI bridge initialization

File:

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

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

@@ -1792 +1792 @@
 }
 
-/* Initializes bridges registers used for routing. */
-static void ich9pciInitBridgeTopology(PICH9PCIGLOBALS pGlobals, PICH9PCIBUS pBus)
+/**
+ * Initializes bridges registers used for routing.
+ *
+ * @returns nothing.
+ * @param   pGlobals         Global device instance data used to generate unique bus numbers.
+ * @param   pBus             The PCI bus to initialize.
+ * @param   uBusPrimary      The primary bus number the bus is connected to.
+ * @param   uBusSecondary    The secondary bus number, i.e. the bus number behind the bridge.
+ */
+static void ich9pciInitBridgeTopology(PICH9PCIGLOBALS pGlobals, PICH9PCIBUS pBus, unsigned uBusPrimary,
+                                      unsigned uBusSecondary)
 {
     PPCIDEVICE pBridgeDev = &pBus->aPciDev;
 
     /* Set only if we are not on the root bus, it has no primary bus attached. */
-    if (pGlobals->uBus != 0)
-    {
-        PCIDevSetByte(pBridgeDev, VBOX_PCI_PRIMARY_BUS, pGlobals->uBus);
-        PCIDevSetByte(pBridgeDev, VBOX_PCI_SECONDARY_BUS, pGlobals->uBus);
-    }
-
-    pGlobals->uBus++;
+    if (uBusSecondary != 0)
+    {
+        PCIDevSetByte(pBridgeDev, VBOX_PCI_PRIMARY_BUS, uBusPrimary);
+        PCIDevSetByte(pBridgeDev, VBOX_PCI_SECONDARY_BUS, uBusSecondary);
+    }
+
     for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
     {
@@ -1811 +1819 @@
                   ("Device is not a PCI bridge but on the list of PCI bridges\n"));
         PICH9PCIBUS pChildBus = PDMINS_2_DATA(pBridge->pDevIns, PICH9PCIBUS);
-        ich9pciInitBridgeTopology(pGlobals, pChildBus);
+        pGlobals->uBus++;
+        ich9pciInitBridgeTopology(pGlobals, pChildBus, uBusSecondary, pGlobals->uBus);
     }
     PCIDevSetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS, pGlobals->uBus);
@@ -1840 +1849 @@
      */
     PICH9PCIBUS pBus = &pGlobals->aPciBus;
-    ich9pciInitBridgeTopology(pGlobals, pBus);
+    ich9pciInitBridgeTopology(pGlobals, pBus, 0, 0);
 
     /*