Changeset 64700 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 17, 2016 6:32:18 PM (8 years ago)

Author:

vboxsync

Message:

ich9pciBiosInitBridgeTopology: Missed VBOX_PCI_SUBORDINATE_BUS, now it works.

File:

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

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

@@ -1690 +1690 @@
  * Initializes bridges registers used for routing.
  *
- * @returns nothing.
+ * @returns Max subordinate bus number.
  * @param   pPciRoot         Global device instance data used to generate unique bus numbers.
  * @param   pBus             The PCI bus to initialize.
@@ -1696 +1696 @@
  * @param   uBusSecondary    The secondary bus number, i.e. the bus number behind the bridge.
  */
-static void ich9pciBiosInitBridgeTopology(PDEVPCIROOT pPciRoot, PDEVPCIBUS pBus, unsigned uBusPrimary, unsigned uBusSecondary)
+static uint8_t ich9pciBiosInitBridgeTopology(PDEVPCIROOT pPciRoot, PDEVPCIBUS pBus, unsigned uBusPrimary, unsigned uBusSecondary)
 {
     PPDMPCIDEV pBridgeDev = &pBus->PciDev;
@@ -1707 +1707 @@
     }
 
-    uint32_t uMaxSubNum = 0;
+    uint8_t uMaxSubNum = 0;
     for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
     {
@@ -1714 +1714 @@
                   ("Device is not a PCI bridge but on the list of PCI bridges\n"));
         PDEVPCIBUS pChildBus = PDMINS_2_DATA(pBridge->Int.s.CTX_SUFF(pDevIns), PDEVPCIBUS);
-        ich9pciBiosInitBridgeTopology(pPciRoot, pChildBus, uBusSecondary, pChildBus->iBus);
-        uMaxSubNum = RT_MAX(uMaxSubNum, pChildBus->iBus);
+        uint8_t uMaxChildSubBus = ich9pciBiosInitBridgeTopology(pPciRoot, pChildBus, uBusSecondary, pChildBus->iBus);
+        uMaxSubNum = RT_MAX(uMaxSubNum, RT_MAX(uMaxChildSubBus, pChildBus->iBus));
     }
     PCIDevSetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS, uMaxSubNum);
@@ -1724 +1724 @@
           PDMPciDevGetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS)
           ));
+
+    return uMaxSubNum;
 }