Changeset 33419 in vbox for trunk

Timestamp:

Oct 25, 2010 12:45:01 PM (14 years ago)

Author:

vboxsync

Message:

PDM, PCI: save MSI-X page in saved state, multiple vectors in MSI, tweaks

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (2 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (10 diffs)
• src/VBox/Devices/Bus/MsiCommon.cpp (modified) (3 diffs)
• src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)
• src/VBox/Devices/USB/DevOHCI.cpp (modified) (2 diffs)

trunk/include/VBox/pdmdev.h

@@ -428 +428 @@
     /** Offset of next capability to MSI */
     uint8_t    iMsiNextOffset;
-    /** Value to initialize MSI message control register */
-    uint16_t   iMsiFlags;
+    /** If we support 64-bit MSI addressing */
+    bool       fMsi64bit;
 
     /** Number of MSI-X interrupt vectors, 0 if MSI-X not supported */

trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

@@ -1530 +1530 @@
     SSMR3GetMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
     SSMR3GetMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
-    
+
     AUD_set_active_in(ISD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), SDCTL(&pThis->hda, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     AUD_set_active_out(OSD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), SDCTL(&pThis->hda, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
@@ -1761 +1761 @@
     aMsiReg.iMsiCapOffset = 0x60;
     aMsiReg.iMsiNextOffset = 0x50;
-    aMsiReg.iMsiFlags = 0;
     rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
     if (RT_FAILURE (rc))

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

@@ -28 +28 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#ifdef IN_RING3
+#include <iprt/alloc.h>
+#endif
 
 #include "../Builtins.h"
@@ -527 +530 @@
         if (MsiIsEnabled(pPciDev))
         {
-            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);
@@ -534 +536 @@
         if (MsixIsEnabled(pPciDev))
         {
-            Log2(("MSI-X interrupt: %d level=%d\n", iIrq, iLevel));
             PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
             MsixNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq, iLevel);
@@ -919 +920 @@
             if (RT_FAILURE(rc))
                 return rc;
+            /* Save MSI-X page state */
+            if (pDev->Int.s.u8MsixCapOffset != 0)
+            {
+                Assert(pDev->Int.s.pMsixPageR3 != NULL);
+                SSMR3PutMem(pSSM, pDev->Int.s.pMsixPageR3, 0x1000);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
         }
     }
@@ -1214 +1223 @@
     }
 
+    void* pvMsixPage = RTMemTmpAllocZ(0x1000);
     /*
      * Iterate all the devices.
@@ -1219 +1229 @@
     for (i = 0;; i++)
     {
+        PPCIDEVICE  pDev;
         PCIDEVICE   DevTmp;
-        PPCIDEVICE  pDev;
 
         /* index / terminator */
@@ -1232 +1242 @@
         {
             AssertMsgFailed(("u32=%#x i=%#x\n", u32, i));
-            return rc;
+            goto out;
         }
 
@@ -1260 +1270 @@
         rc = SSMR3GetU32(pSSM, &DevTmp.Int.s.uFlags);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
 
         rc = SSMR3GetS32(pSSM, &DevTmp.Int.s.uIrqPinState);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
 
         rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapOffset);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
 
         rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapSize);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
 
         rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsixCapOffset);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
 
         rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsixCapSize);
         if (RT_FAILURE(rc))
-            return rc;
+            goto out;
+
+        /* Load MSI-X page state */
+        if (DevTmp.Int.s.u8MsixCapOffset != 0)
+        {
+            Assert(pvMsixPage != NULL);
+            SSMR3GetMem(pSSM, pvMsixPage, 0x1000);
+            if (RT_FAILURE(rc))
+                goto out;
+        }
 
         /* check that it's still around. */
@@ -1303 +1322 @@
 
         pDev->Int.s.uIrqPinState = DevTmp.Int.s.uIrqPinState;
-    }
-
-    return VINF_SUCCESS;
+        pDev->Int.s.u8MsiCapOffset  = DevTmp.Int.s.u8MsiCapOffset;
+        pDev->Int.s.u8MsiCapSize    = DevTmp.Int.s.u8MsiCapSize;
+        pDev->Int.s.u8MsixCapOffset = DevTmp.Int.s.u8MsixCapOffset;
+        pDev->Int.s.u8MsixCapSize   = DevTmp.Int.s.u8MsixCapSize;
+        if (DevTmp.Int.s.u8MsixCapSize != 0)
+        {
+            Assert(pDev->Int.s.pMsixPageR3 != NULL);
+            memcpy(pDev->Int.s.pMsixPageR3, pvMsixPage, 0x1000);
+        }
+    }
+
+  out:
+    if (pvMsixPage)
+        RTMemTmpFree(pvMsixPage);
+
+    return rc;
 }
 
@@ -1892 +1924 @@
     int32_t     iFunction;
 } PciSlotAssignments[] = {
-    /* Due to somewhat inflexible PCI bus configuration, ConsoleImpl hardcodes 0:5:0 as HDA address, so we shalln't put elsewhere */ 
+    /* Due to somewhat inflexible PCI bus configuration, ConsoleImpl hardcodes 0:5:0 as HDA address, so we shalln't put elsewhere */
 #if 0
     {

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

@@ -54 +54 @@
 }
 
-DECLINLINE(bool) msiIsMME(PPCIDEVICE pDev)
-{
-    return (msiGetMessageControl(pDev) & VBOX_PCI_MSI_FLAGS_QSIZE) != 0;
+DECLINLINE(uint8_t) msiGetMme(PPCIDEVICE pDev)
+{
+    return (msiGetMessageControl(pDev) & VBOX_PCI_MSI_FLAGS_QSIZE) >> 4;
 }
 
@@ -78 +78 @@
     uint16_t lo = PCIDevGetWord(pDev, pDev->Int.s.u8MsiCapOffset + iOff);
 
-    /// @todo: vector encoding into lower bits of message data, for Multiple Message Enable
-    Assert(!msiIsMME(pDev));
+    // vector encoding into lower bits of message data
+    uint8_t bits = msiGetMme(pDev);
+    uint16_t uMask = ((1 << bits) - 1);
+    lo &= ~uMask;
+    lo |= iVector & uMask;
 
     return RT_MAKE_U32(lo, 0);
@@ -219 +222 @@
     uint8_t    iCapOffset  = pMsiReg->iMsiCapOffset;
     uint8_t    iNextOffset = pMsiReg->iMsiNextOffset;
-    uint16_t   iFlags   = pMsiReg->iMsiFlags;
-
-    if (cVectors != 1)
-        /* We cannot handle multiple vectors yet */
+    bool       f64bit      = pMsiReg->fMsi64bit;
+    uint16_t   iFlags      = 0;
+    int        iMmc;
+
+    /* Compute multiple-message capable bitfield */
+    for (iMmc = 0; iMmc < 6; iMmc++)
+    {
+        if ((1 << iMmc) >= cVectors)
+            break;
+    }
+
+    if ((cVectors > VBOX_MSI_MAX_ENTRIES) || (1 << iMmc) < cVectors)
         return VERR_TOO_MUCH_DATA;
 
-    if (cVectors > VBOX_MSI_MAX_ENTRIES)
-        return VERR_TOO_MUCH_DATA;
-
     Assert(iCapOffset != 0 && iCapOffset < 0xff && iNextOffset < 0xff);
 
-    bool f64bit = (iFlags & VBOX_PCI_MSI_FLAGS_64BIT) != 0;
     /* We always support per-vector masking */
-    iFlags |= VBOX_PCI_MSI_FLAGS_MASKBIT;
+    iFlags |= VBOX_PCI_MSI_FLAGS_MASKBIT | iMmc;
+    if (f64bit)
+        iFlags |= VBOX_PCI_MSI_FLAGS_64BIT;
+    /* How many vectors we're capable of */
+    iFlags |= iMmc;
 
     pDev->Int.s.u8MsiCapOffset = iCapOffset;

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -5054 +5054 @@
     PDMMSIREG aMsiReg;
     RT_ZERO(aMsiReg);
+    /* use this code for MSI-X support */
+#if 0
+    aMsiReg.cMsixVectors = 1;
+    aMsiReg.iMsixCapOffset = 0x80;
+    aMsiReg.iMsixNextOffset = 0x0;
+    aMsiReg.iMsixBar = 3;
+#else
     aMsiReg.cMsiVectors = 1;
     aMsiReg.iMsiCapOffset = 0x80;
     aMsiReg.iMsiNextOffset = 0x0;
-    aMsiReg.iMsiFlags = 0;
+#endif
     rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
     if (RT_FAILURE (rc))

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -5417 +5417 @@
     aMsiReg.iMsiCapOffset = 0x80;
     aMsiReg.iMsiNextOffset = 0x0;
-    aMsiReg.iMsiFlags = 0;
     rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
     if (RT_FAILURE (rc))
@@ -5575 +5574 @@
 #endif /* IN_RING3 */
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
-