Changeset 71155 in vbox

Timestamp:

Feb 28, 2018 2:56:07 PM (7 years ago)

Author:

vboxsync

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

121050

Message:

Devices/Bus/ICH9: Don't meddle with the IRQ value when traversing bridges if the originating device has MSI/MSI-X enabled. The IRQ has a completely different meaning here (the MSI/MSI-X vector to use) and is not subject to the pin routing for bridges. MSI/MSI-X interrupt handling code paths should really be separated properly to avoid such confusing issues but for a safe backport this is the immediate fix for now

File:

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

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

@@ -152 +152 @@
 
     AssertMsgReturnVoid(pBus->iBus == 0, ("This is not the host pci bus iBus=%d\n", pBus->iBus));
-    ich9pciSetIrqInternal(DEVPCIBUS_2_DEVPCIROOT(pBus), uDevFnBridge, pPciDev, iIrqPinBridge, iLevel, uTagSrc);
+
+    /*
+     * For MSI/MSI-X enabled devices the iIrq doesn't denote the pin but rather a vector which is completely
+     * orthogonal to the pin based approach. The vector is not subject to the pin based routing with PCI bridges.
+     */
+    int iIrqPinVector = iIrqPinBridge;
+    if (   MsiIsEnabled(pPciDev)
+        || MsixIsEnabled(pPciDev))
+        iIrqPinVector = iIrq;
+    ich9pciSetIrqInternal(DEVPCIBUS_2_DEVPCIROOT(pBus), uDevFnBridge, pPciDev, iIrqPinVector, iLevel, uTagSrc);
 }