Changeset 36663 in vbox

Timestamp:

Apr 13, 2011 3:57:33 PM (14 years ago)

Author:

vboxsync

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

71145

Message:

PCI: tweaks

Location:

trunk/src/VBox/Devices/Bus

Files:

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

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

@@ -891 +891 @@
 
     rc = MsiInit(pPciDev, pMsiReg);
-    if (rc != VINF_SUCCESS)
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = MsixInit(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp), pPciDev, pMsiReg);
-    if (rc != VINF_SUCCESS)
+    if (RT_FAILURE(rc))
         return rc;
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -1874 +1874 @@
     if ((u32Address + len) > 256 && (u32Address + len) < 4096)
     {
-        AssertMsgReturn(false, ("Read from extended registers falled back to generic code\n"), 0);
-    }
-
-    AssertMsgReturn(u32Address + len <= 256, ("Read after end of PCI config space\n"),
+        AssertMsgReturn(false, ("Read from extended registers fallen back to generic code\n"), 0);
+    }
+
+    AssertMsgReturn(u32Address + len <= 256, ("Read after the end of PCI config space\n"),
                     0);
     if (   pciDevIsMsiCapable(aDev)
@@ -1956 +1956 @@
     if ((u32Address + len) > 256 && (u32Address + len) < 4096)
     {
-        AssertMsgReturnVoid(false, ("Write to extended registers falled back to generic code\n"));
+        AssertMsgReturnVoid(false, ("Write to extended registers fallen back to generic code\n"));
     }
 

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

@@ -102 +102 @@
 }
 
-
+#ifdef IN_RING3
 void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, uint32_t u32Address, uint32_t val, unsigned len)
 {
@@ -214 +214 @@
 }
 
-
 int MsiInit(PPCIDEVICE pDev, PPDMMSIREG pMsiReg)
 {
     if (pMsiReg->cMsiVectors == 0)
          return VINF_SUCCESS;
+
+    /* We cannot init MSI on raw devices yet. */
+    Assert(!pciDevIsPassthrough(pDev));
 
     uint16_t   cVectors    = pMsiReg->cMsiVectors;
@@ -261 +263 @@
 }
 
+#endif /* IN_RING3 */
+
 
 bool     MsiIsEnabled(PPCIDEVICE pDev)

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

@@ -28 +28 @@
 #endif
 
+#ifdef IN_RING3
 /* Init MSI support in the device. */
 int      MsiInit(PPCIDEVICE pDev, PPDMMSIREG pMsiReg);
+#endif
 
 /* If MSI is enabled, so that MSINotify() shall be used for notifications.  */
@@ -37 +39 @@
 void     MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector, int iLevel);
 
+#ifdef IN_RING3
 /* PCI config space accessors for MSI registers */
 void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, uint32_t u32Address, uint32_t val, unsigned len);
 uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len);
+#endif
 
-
+#ifdef IN_RING3
 /* Init MSI-X support in the device. */
-#ifdef IN_RING3
 int      MsixInit(PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, PPDMMSIREG pMsiReg);
 #endif
@@ -53 +56 @@
 void     MsixNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector, int iLevel);
 
+#ifdef IN_RING3
 /* PCI config space accessors for MSI-X */
 void     MsixPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, uint32_t u32Address, uint32_t val, unsigned len);
 uint32_t MsixPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len);
+#endif

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

@@ -167 +167 @@
          return VINF_SUCCESS;
 
-    uint16_t   cVectors    = pMsiReg->cMsixVectors;
+     /* We cannot init MSI-X on raw devices yet. */
+    Assert(!pciDevIsPassthrough(pDev));
+
+    uint16_t   cVectors    = pMsiReg->cMsixVectors;   
     uint8_t    iCapOffset  = pMsiReg->iMsixCapOffset;
     uint8_t    iNextOffset = pMsiReg->iMsixNextOffset;
@@ -173 +176 @@
 
     if (cVectors > VBOX_MSIX_MAX_ENTRIES)
+    {
+        AssertMsgFailed(("Too many MSI-X vectors: %d\n", cVectors));
         return VERR_TOO_MUCH_DATA;
+    }
 
     if (iBar > 5)
+    {
+        AssertMsgFailed(("Using wrong BAR for MSI-X: %d\n", iBar));
         return VERR_INVALID_PARAMETER;
+    }
 
     Assert(iCapOffset != 0 && iCapOffset < 0xff && iNextOffset < 0xff);
 
-    int rc;
-
-    rc = PDMDevHlpPCIIORegionRegister (pDev->pDevIns, iBar, 0x1000, PCI_ADDRESS_SPACE_MEM, msixMap);
-    if (RT_FAILURE (rc))
-        return rc;
+    int rc = VINF_SUCCESS;
+
+    /* If device is passthrough, BAR is registered using common mechanism. */
+    if (!pciDevIsPassthrough(pDev))
+    {
+        rc = PDMDevHlpPCIIORegionRegister (pDev->pDevIns, iBar, 0x1000, PCI_ADDRESS_SPACE_MEM, msixMap);
+        if (RT_FAILURE (rc))
+            return rc;
+    }
 
     pDev->Int.s.u8MsixCapOffset = iCapOffset;