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

Timestamp:

Oct 18, 2010 5:51:24 PM (14 years ago)

Author:

vboxsync

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

66759

Message:

PCI: fixed few MSI-related bugs, now SLES boots fine with MSI SATA

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPciIch9.cpp (modified) (1 diff)
• MsiCommon.cpp (modified) (5 diffs)
• MsiCommon.h (modified) (1 diff)

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

@@ -527 +527 @@
         if (MsiIsEnabled(pPciDev))
         {
-            Log2(("Raise a MSI interrupt: %d\n", iIrq));
-            /* We only trigger MSI on level up, as technically it's matching flip-flop best (maybe even assert that level == PDM_IRQ_LEVEL_FLIP_FLOP) */
-            if ((iLevel & PDM_IRQ_LEVEL_HIGH) != 0)
-            {
-                PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
-                MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq);
-            }
+            Log2(("MSI interrupt: %d level=%d\n", iIrq, iLevel));
+            PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
+            MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel);
         }
         return;

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

@@ -91 +91 @@
 }
 
+DECLINLINE(bool) msiBitJustSet(uint32_t u64OldValue,
+                               uint32_t u64NewValue,
+                               uint32_t u64Mask)
+{
+    return (!(u64OldValue & u64Mask) && !!(u64NewValue & u64Mask));
+}
+
 
 void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, uint32_t u32Address, uint32_t val, unsigned len)
@@ -142 +149 @@
                     if (maskUpdated != -1 && msiIsEnabled(pDev))
                     {
-                        for (int iBitNum = 0; i<8; i++)
+                        uint32_t*  puPending = msiGetPendingBits(pDev);
+                        for (int iBitNum = 0; iBitNum < 8; iBitNum++)
                         {
                             int32_t iBit = 1 << iBitNum;
+                            uint32_t uVector = maskUpdated*8 + iBitNum;
+
                             if (msiBitJustCleared(pDev->config[uAddr], val, iBit))
                             {
+                                Log(("msi: mask updated bit %d@%x (%d)\n", iBitNum, uAddr, maskUpdated));
+
                                 /* To ensure that we're no longer masked */
                                 pDev->config[uAddr] &= ~iBit;
-                                MsiNotify(pDevIns, pPciHlp, pDev, maskUpdated*8 + iBitNum);
+                                if ((*puPending & (1 << uVector)) != 0)
+                                {
+                                    Log(("msi: notify earlier masked pending vector: %d\n", uVector));
+                                    MsiNotify(pDevIns, pPciHlp, pDev, uVector, PDM_IRQ_LEVEL_HIGH);
+                                }
+                            }
+                            if (msiBitJustSet(pDev->config[uAddr], val, iBit))
+                            {
+                                Log(("msi: mask vector: %d\n", uVector));
                             }
                         }
@@ -219 +239 @@
     PCIDevSetWord(pDev,  iCapOffset + VBOX_MSI_CAP_MESSAGE_CONTROL, iMsiFlags);
 
+    *msiGetMaskBits(pDev)    = 0;
+    *msiGetPendingBits(pDev) = 0;
+
     PCISetMsiCapable(pDev);
 
@@ -230 +253 @@
 }
 
-void MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector)
-{
-    Log2(("MSINotify: %d\n", iVector));
-
+void MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector, int iLevel)
+{
     AssertMsg(msiIsEnabled(pDev), ("Must be enabled to use that"));
 
     uint32_t   uMask = *msiGetMaskBits(pDev);
-    uint32_t*  upPending = msiGetPendingBits(pDev);
+    uint32_t*  puPending = msiGetPendingBits(pDev);
+
+    LogFlow(("MSINotify: %d pending=%x mask=%x\n", iVector, *puPending, uMask));
+
+    /* We only trigger MSI on level up */
+    if ((iLevel & PDM_IRQ_LEVEL_HIGH) == 0)
+    {
+        /* @todo: maybe clear pending interrupts on level down? */
+#if 0
+        *puPending &= ~(1<<iVector);
+        LogFlow(("msi: clear pending %d, now %x\n", iVector, *puPending));
+#endif
+        return;
+    }
 
     if ((uMask & (1<<iVector)) != 0)
     {
-        *upPending |= (1<<iVector);
+        *puPending |= (1<<iVector);
+        LogFlow(("msi: %d is masked, mark pending, now %x\n", iVector, *puPending));
         return;
     }
@@ -248 +283 @@
     uint32_t   u32Value = msiGetMsiData(pDev, iVector);
 
-    *upPending &= ~(1<<iVector);
+    *puPending &= ~(1<<iVector);
 
     Assert(pPciHlp->pfnIoApicSendMsi != NULL);

trunk/src/VBox/Devices/Bus/MsiCommon.h

@@ -35 +35 @@
 
 /* Device notification (aka interrupt). */
-void     MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector);
+void     MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector, int iLevel);
 
 /* PCI config space accessors for MSI registers */