Changeset 64454 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2016 12:39:30 PM (8 years ago)

Author:

vboxsync

Message:

DevPci: Cleaned up ich9pciConfigReadDev, eleminating unnecessary MSI and MSI-x workers.

Location:

trunk/src/VBox/Devices/Bus

Files:

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

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

@@ -1890 +1890 @@
 {
     NOREF(pDevIns);
+
     uint32_t uValue;
-
     if (uAddress + cb <= 256)
     {
-        /* Check for MSI capabilities - not really necessary, MsiPciConfigRead does the same as below! */
-        if (   pciDevIsMsiCapable(pPciDev)
-            && uAddress - (uint32_t)pPciDev->Int.s.u8MsiCapOffset < (uint32_t)pPciDev->Int.s.u8MsiCapSize )
-            return MsiPciConfigRead(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns), pPciDev, uAddress, cb);
-
-        /* Check for MSI-X capabilities - not really necessary, MsixPciConfigRead does the same as below! */
-        if (   pciDevIsMsixCapable(pPciDev)
-            && uAddress - (uint32_t)pPciDev->Int.s.u8MsixCapOffset < (uint32_t)pPciDev->Int.s.u8MsixCapSize)
-            return MsixPciConfigRead(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns), pPciDev, uAddress, cb);
-
         switch (cb)
         {
@@ -1920 +1910 @@
                 break;
         }
+
+#ifdef LOG_ENABLED
+        if (   pciDevIsMsiCapable(pPciDev)
+            && uAddress - (uint32_t)pPciDev->Int.s.u8MsiCapOffset < (uint32_t)pPciDev->Int.s.u8MsiCapSize )
+            Log2(("ich9pciConfigReadDev: MSI CAP: %#x LB %u -> %#x\n", uAddress - (uint32_t)pPciDev->Int.s.u8MsiCapOffset, cb, uValue));
+        else if (   pciDevIsMsixCapable(pPciDev)
+                 && uAddress - (uint32_t)pPciDev->Int.s.u8MsixCapOffset < (uint32_t)pPciDev->Int.s.u8MsixCapSize)
+            Log2(("ich9pciConfigReadDev: MSI-X CAP: %#x LB %u -> %#x\n", uAddress - (uint32_t)pPciDev->Int.s.u8MsiCapOffset, cb, uValue));
+#endif
     }
     else

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

@@ -202 +202 @@
 }
 
-uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPDMPCIDEV pDev, uint32_t u32Address, unsigned len)
-{
-    RT_NOREF1(pDevIns);
-#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
-    int32_t off = u32Address - pDev->Int.s.u8MsiCapOffset;
-    Assert(off >= 0 && (pciDevIsMsiCapable(pDev) && off < pDev->Int.s.u8MsiCapSize));
-#endif
-    uint32_t rv = 0;
-
-    switch (len)
-    {
-        case 1:
-            rv = PCIDevGetByte(pDev,  u32Address);
-            break;
-        case 2:
-            rv = PCIDevGetWord(pDev,  u32Address);
-            break;
-        case 4:
-            rv = PCIDevGetDWord(pDev, u32Address);
-            break;
-        default:
-            Assert(false);
-    }
-
-    Log2(("MsiPciConfigRead: %d (%d) -> %x\n", off, len, rv));
-
-    return rv;
-}
-
 int MsiInit(PPDMPCIDEV pDev, PPDMMSIREG pMsiReg)
 {

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

@@ -42 +42 @@
 /* PCI config space accessors for MSI registers */
 void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev, uint32_t u32Address, uint32_t val, unsigned len);
-uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPDMPCIDEV pDev, uint32_t u32Address, unsigned len);
 #endif
 
@@ -59 +58 @@
 /* PCI config space accessors for MSI-X */
 void     MsixPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev, uint32_t u32Address, uint32_t val, unsigned len);
-uint32_t MsixPciConfigRead (PPDMDEVINS pDevIns, PPDMPCIDEV pDev, uint32_t u32Address, unsigned len);
 #endif

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

@@ -329 +329 @@
 }
 
-
-uint32_t MsixPciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pDev, uint32_t u32Address, unsigned len)
-{
-    NOREF(pDevIns);
-#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
-    int32_t iOff = u32Address - pDev->Int.s.u8MsixCapOffset;
-    Assert(iOff >= 0 && (pciDevIsMsixCapable(pDev) && iOff < pDev->Int.s.u8MsixCapSize));
-#endif
-    uint32_t rv;
-    switch (len)
-    {
-        case 1:
-            rv = PCIDevGetByte(pDev,  u32Address);
-            break;
-        case 2:
-            rv = PCIDevGetWord(pDev,  u32Address);
-            break;
-        case 4:
-            rv = PCIDevGetDWord(pDev, u32Address);
-            break;
-        default:
-            AssertFailed();
-            rv = 0;
-    }
-
-    Log2(("MsixPciConfigRead: %d (%d) -> %x\n", iOff, len, rv));
-    return rv;
-}
-