Changeset 89200 in vbox for trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

Timestamp:

May 20, 2021 2:05:10 PM (4 years ago)

Author:

vboxsync

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

144541

Message:

Intel IOMMU: bugref:9967 Add ring-3 MSI queuing for the IOMMU send MSI interface as well. Added a todo for later.

File:

• trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)

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

@@ -1626 +1626 @@
 
 
-/** @interface_method_impl{PDMPCIHLPR0,pfnIoApicSendMsi} */
-static DECLCALLBACK(void) pdmR0PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    Assert(PCIBDF_IS_VALID(uBusDevFn));
-    Log4(("pdmR0PciHlp_IoApicSendMsi: uBusDevFn=%#x Msi=(Addr:%#RX64 Data:%#RX32) uTagSrc=%#x\n", uBusDevFn, pMsi->Addr.u64,
-          pMsi->Data.u32, uTagSrc));
+/**
+ * Helper for sending an MSI via the I/O APIC.
+ *
+ * @param   pDevIns     PCI device instance.
+ * @param   uBusDevFn   The bus:device:function of the device initiating the MSI.
+ * @param   pMsi        The MSI to send.
+ * @param   uTagSrc     The IRQ tag and source (for tracing).
+ */
+static void pdmR0IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
     PGVM pGVM = pDevIns->Internal.s.pGVM;
     if (pGVM->pdm.s.IoApic.pDevInsR0)
@@ -1656 +1659 @@
 
 
+/** @interface_method_impl{PDMPCIHLPR0,pfnIoApicSendMsi} */
+static DECLCALLBACK(void) pdmR0PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    Assert(PCIBDF_IS_VALID(uBusDevFn));
+    Log4(("pdmR0PciHlp_IoApicSendMsi: uBusDevFn=%#x Msi=(Addr:%#RX64 Data:%#RX32) uTagSrc=%#x\n", uBusDevFn, pMsi->Addr.u64,
+          pMsi->Data.u32, uTagSrc));
+    pdmR0IoApicSendMsi(pDevIns, uBusDevFn, pMsi, uTagSrc);
+}
+
+
 /** @interface_method_impl{PDMPCIHLPR0,pfnLock} */
 static DECLCALLBACK(int) pdmR0PciHlp_Lock(PPDMDEVINS pDevIns, int rc)
@@ -1731 +1745 @@
 
 /** @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);
+static DECLCALLBACK(void) pdmR0IommuHlp_SendMsi(PPDMDEVINS pDevIns, PCMSIMSG pMsi, uint32_t uTagSrc)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    pdmR0IoApicSendMsi(pDevIns, NIL_PCIBDF, pMsi, uTagSrc);
 }