Changeset 84859 in vbox

Timestamp:

Jun 17, 2020 9:12:19 AM (5 years ago)

Author:

vboxsync

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

138678

Message:

AMD IOMMU: bugref:9654 DevIoApic: Remap MSIs via the IOMMU before calling into the APIC.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -865 +865 @@
     XAPICINTR ApicIntr;
     RT_ZERO(ApicIntr);
+
+#ifdef VBOX_WITH_IOMMU_AMD
+    /*
+     * The MSI may need to be remapped (or discarded) if an IOMMU is present.
+     */
+    MSIMSG MsiOut;
+    Assert(PCIBDF_IS_VALID(uBusDevFn));
+    int rcRemap = pThisCC->pIoApicHlp->pfnIommuMsiRemap(pDevIns, uBusDevFn, pMsi, &MsiOut);
+    if (RT_SUCCESS(rcRemap))
+        ioapicGetApicIntrFromMsi(&MsiOut, &ApicIntr);
+    else
+    {
+        if (rcRemap == VERR_IOMMU_INTR_REMAP_DENIED)
+            Log3(("IOAPIC: MSI (Addr=%#RX64 Data=%#RX32) remapping denied. rc=%Rrc", pMsi->Addr.u64, pMsi->Data.u32, rcRemap));
+        else
+            Log(("IOAPIC: MSI (Addr=%#RX64 Data=%#RX32) remapping failed. rc=%Rrc", pMsi->Addr.u64, pMsi->Data.u32, rcRemap));
+        return;
+    }
+#else
     ioapicGetApicIntrFromMsi(pMsi, &ApicIntr);
-
-    /** @todo IOMMU: Call into the IOMMU to remap the MSI. uBusDevFn will be used
-     *        then. */
-    NOREF(uBusDevFn);
+#endif
 
     /*