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

Timestamp:

Sep 9, 2020 9:50:01 AM (5 years ago)

Author:

vboxsync

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

140287

Message:

AMD IOMMU: bugref:9654 Fix accidentally not copying/initialize MSIMSG values. Fix using the translated memory address on
successful translations from the IOMMU. Fix not remapping any interrupt when IOMMU code is compiled but an IOMMU is not present.

File:

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

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

@@ -166 +166 @@
         uint16_t const uDeviceId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemRead(pDevInsIommu, uDeviceId, GCPhys, cbRead, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR0DevHlp_PCIPhysRead: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
@@ -218 +220 @@
         uint16_t const uDeviceId = PCIBDF_MAKE(pBus->iBus, pPciDev->uDevFn);
         int rc = pIommu->pfnMemWrite(pDevInsIommu, uDeviceId, GCPhys, cbWrite, &GCPhysOut);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            GCPhys = GCPhysOut;
+        else
         {
             Log(("pdmR0DevHlp_PCIPhysWrite: IOMMU translation failed. uDeviceId=%#x GCPhys=%#RGp cb=%u rc=%Rrc\n", uDeviceId,
@@ -1569 +1573 @@
                         ("pdmR0IoApicHlp_IommuMsiRemap: pfnMsiRemap invalid!\n"), VERR_INVALID_POINTER);
         int rc = pIommu->pfnMsiRemap(pDevInsIommu, uDevId, pMsiIn, pMsiOut);
-        if (RT_FAILURE(rc))
-        {
-            Log(("pdmR0IoApicHlp_IommuMsiRemap: IOMMU MSI remap failed. uDevId=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n",
-                 uDevId, pMsiIn->Addr.u64, pMsiIn->Data.u32, rc));
+        if (RT_SUCCESS(rc))
             return rc;
-        }
+
+        Log(("pdmR0IoApicHlp_IommuMsiRemap: IOMMU MSI remap failed. uDevId=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n",
+             uDevId, pMsiIn->Addr.u64, pMsiIn->Data.u32, rc));
     }
 #else
     RT_NOREF(pDevIns, uDevId);
+#endif
+
     *pMsiOut = *pMsiIn;
-#endif
     return VINF_SUCCESS;
 }