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

Timestamp:

Nov 13, 2009 1:58:10 PM (15 years ago)

Author:

vboxsync

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

54794

Message:

PCI: Fix interrupt mapping for certain slots behind a bridge

File:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (1 diff)

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

@@ -2208 +2208 @@
      * of our parent passing the device which asserted the interrupt instead of the device of the bridge.
      */
-    PPCIBUS     pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
-    int iIrqPinBridge = 0;
-    uint8_t uDevFnBridge = pPciDev->devfn;
+    PPCIBUS    pBus          = PDMINS_2_DATA(pDevIns, PPCIBUS);
+    PPCIDEVICE pPciDevBus    = pPciDev;
+    int        iIrqPinBridge = iIrq;
+    uint8_t    uDevFnBridge  = 0;
 
     /* Walk the chain until we reach the host bus. */
-    while (pBus->iBus != 0)
-    {
-        uDevFnBridge = pBus->PciDev.devfn;
-        iIrqPinBridge = ((uDevFnBridge >> 3) + iIrqPinBridge) & 3;
+    do
+    {
+        uDevFnBridge  = pBus->PciDev.devfn;
+        iIrqPinBridge = ((pPciDevBus->devfn >> 3) + iIrqPinBridge) & 3;
+
         /* Get the parent. */
         pBus = pBus->PciDev.Int.s.CTX_SUFF(pBus);
-    }
+        pPciDevBus = &pBus->PciDev;
+    } while (pBus->iBus != 0);
 
     AssertMsg(pBus->iBus == 0, ("This is not the host pci bus iBus=%d\n", pBus->iBus));