Changeset 88580 in vbox

Timestamp:

Apr 19, 2021 3:52:45 PM (4 years ago)

Author:

vboxsync

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

143878

Message:

Intel IOMMU: bugref:9967 PDM: Interface for sending MSI directly from the IOMMU device.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (6 diffs)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -1518 +1518 @@
     DECLR0CALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
 
+    /**
+     * Send an MSI (when generated by the IOMMU device itself).
+     *
+     * @param   pDevIns         PCI device instance.
+     * @param   pMsi            The MSI to send.
+     * @param   uTagSrc         The IRQ tag and source (for tracing).
+     */
+    DECLR0CALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
+
     /** Just a safety precaution. */
     uint32_t                u32TheEnd;
@@ -1527 +1536 @@
 
 /** Current PDMIOMMUHLPR0 version number. */
-#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 3, 0)
+#define PDM_IOMMUHLPR0_VERSION                      PDM_VERSION_MAKE(0xff13, 4, 0)
 
 
@@ -1562 +1571 @@
      */
     DECLRCCALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
+
+    /**
+     * Send an MSI (when generated by the IOMMU device itself).
+     *
+     * @param   pDevIns         PCI device instance.
+     * @param   pMsi            The MSI to send.
+     * @param   uTagSrc         The IRQ tag and source (for tracing).
+     */
+    DECLRCCALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** Just a safety precaution. */
@@ -1572 +1590 @@
 
 /** Current PDMIOMMUHLPRC version number. */
-#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 3, 0)
+#define PDM_IOMMUHLPRC_VERSION                      PDM_VERSION_MAKE(0xff14, 4, 0)
 
 
@@ -1607 +1625 @@
      */
     DECLR3CALLBACKMEMBER(bool,  pfnLockIsOwner,(PPDMDEVINS pDevIns));
+
+    /**
+     * Send an MSI (when generated by the IOMMU device itself).
+     *
+     * @param   pDevIns         PCI device instance.
+     * @param   pMsi            The MSI to send.
+     * @param   uTagSrc         The IRQ tag and source (for tracing).
+     */
+    DECLR3CALLBACKMEMBER(int,   pfnSendMsi,(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc));
 
     /** Just a safety precaution. */
@@ -1617 +1644 @@
 
 /** Current PDMIOMMUHLPR3 version number. */
-#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 3, 0)
+#define PDM_IOMMUHLPR3_VERSION                      PDM_VERSION_MAKE(0xff15, 4, 0)
 
 

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

@@ -1696 +1696 @@
 }
 
+/** @interface_method_impl{PDMIOMMUHLPR0,pfnSendMsi} */
+static DECLCALLBACK(int) pdmR0IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PGVM pGVM = pDevIns->Internal.s.pGVM;
+    if (pGVM->pdm.s.IoApic.pDevInsR0)
+    {
+        Assert(pGVM->pdm.s.IoApic.pfnSendMsiR0);
+        pGVM->pdm.s.IoApic.pfnSendMsiR0(pGVM->pdm.s.IoApic.pDevInsR0, NIL_PCIBDF, pMsi, uTagSrc);
+        return VINF_SUCCESS;
+    }
+
+    /** @todo Implement this. */
+    AssertMsgFailedReturn(("Queue PDM task for sending the MSI in ring-3"), VERR_IOMMU_IPE_5);
+}
+
 
 /**
@@ -1706 +1722 @@
     pdmR0IommuHlp_Unlock,
     pdmR0IommuHlp_LockIsOwner,
+    pdmR0IommuHlp_SendMsi,
     PDM_IOMMUHLPR0_VERSION, /* the end */
 };

trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp

@@ -291 +291 @@
 
 
+/** @interface_method_impl{PDMIOMMUHLPR3,pfnSendMsi} */
+static DECLCALLBACK(int) pdmR3IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlowFunc(("caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return PDMIoApicSendMsi(pDevIns->Internal.s.pVMR3, NIL_PCIBDF, pMsi, uTagSrc);
+}
+
+
 /**
  * IOMMU Device Helpers.
@@ -300 +309 @@
     pdmR3IommuHlp_Unlock,
     pdmR3IommuHlp_LockIsOwner,
+    pdmR3IommuHlp_SendMsi,
     PDM_IOMMUHLPR3_VERSION /* the end */
 };