Changeset 52530 in vbox

Timestamp:

Aug 29, 2014 3:17:52 PM (11 years ago)

Author:

vboxsync

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

95783

Message:

ICH9: PCI IRQ disable bit has no effect on MSIs (#7505).

File:

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

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

@@ -608 +608 @@
                                   int iIrq, int iLevel, uint32_t uTagSrc)
 {
-
-    if (PCIDevIsIntxDisabled(pPciDev))
-    {
-        if (MsiIsEnabled(pPciDev))
-        {
-            LogFlowFunc(("PCI Dev %p : MSI\n", pPciDev));
-            PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
-            MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel, uTagSrc);
-        }
-
-        if (MsixIsEnabled(pPciDev))
-        {
-            LogFlowFunc(("PCI Dev %p : MSI-X\n", pPciDev));
-            PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
-            MsixNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel, uTagSrc);
-        }
+    /* If MSI or MSI-X is enabled, PCI INTx# signals are disabled regardless of the PCI command
+     * register interrupt bit state.
+     * PCI 3.0 (section 6.8) forbids MSI and MSI-X to be enabled at the same time and makes
+     * that undefined behavior. We check for MSI first, then MSI-X.
+     */
+    if (MsiIsEnabled(pPciDev))
+    {
+        Assert(!MsixIsEnabled(pPciDev));    /* Not allowed -- see note above. */
+        LogFlowFunc(("PCI Dev %p : MSI\n", pPciDev));
+        PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
+        MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel, uTagSrc);
+        return;
+    }
+
+    if (MsixIsEnabled(pPciDev))
+    {
+        LogFlowFunc(("PCI Dev %p : MSI-X\n", pPciDev));
+        PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
+        MsixNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel, uTagSrc);
         return;
     }