Changeset 88367 in vbox for trunk

Timestamp:

Apr 5, 2021 7:58:44 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 WIP.

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (8 diffs)

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

@@ -46 +46 @@
 #define DMAR_ASSERT_MMIO_ACCESS_RET(a_off, a_cb) \
     do { \
-         AssertReturn(!(off & 3), VINF_IOM_MMIO_UNUSED_FF); \
-         AssertReturn(cb == 4 || cb == 8, VINF_IOM_MMIO_UNUSED_FF); \
+         AssertReturn((a_cb) == 4 || (a_cb) == 8, VINF_IOM_MMIO_UNUSED_FF); \
+         AssertReturn(!((a_off) & ((a_cb) - 1)), VINF_IOM_MMIO_UNUSED_FF); \
     } while (0);
 
@@ -682 +682 @@
             }
         }
+
+        LogFlowFunc(("offReg=%#x\n", offReg));
         return VINF_SUCCESS;
     }
+
     return VINF_IOM_MMIO_UNUSED_FF;
 }
@@ -705 +708 @@
         else
             *(uint32_t *)pv = dmarRegRead32(pThis, offReg);
+
+        LogFlowFunc(("offReg=%#x\n", offReg));
         return VINF_SUCCESS;
     }
@@ -719 +724 @@
 {
     RT_NOREF1(pDevIns);
+    LogFlowFunc(("\n"));
 }
 
@@ -728 +734 @@
 {
     RT_NOREF(pDevIns);
-    return VERR_NOT_IMPLEMENTED;
+    LogFlowFunc(("\n"));
+    return VINF_SUCCESS;
 }
 
@@ -827 +834 @@
     AssertRCReturn(rc, rc);
 
-    return VERR_NOT_IMPLEMENTED;
+    LogRel(("%s: Cap=%#RX64 Ext. Cap=%#RX64\n", DMAR_LOG_PFX, dmarRegRead64(pThis, VTD_MMIO_OFF_CAP_REG),
+            dmarRegRead64(pThis, VTD_MMIO_OFF_ECAP_REG)));
+    return VINF_SUCCESS;
 }
 
@@ -859 +868 @@
     IommuReg.pfnMsiRemap      = iommuIntelMsiRemap;
     IommuReg.u32TheEnd        = PDM_IOMMUREGCC_VERSION;
+
     rc = PDMDevHlpIommuSetUpContext(pDevIns, &IommuReg, &pThisCC->CTX_SUFF(pIommuHlp));
     AssertRCReturn(rc, rc);
@@ -866 +876 @@
     AssertPtrReturn(pThisCC->CTX_SUFF(pIommuHlp)->pfnLock,   VERR_INVALID_POINTER);
     AssertPtrReturn(pThisCC->CTX_SUFF(pIommuHlp)->pfnUnlock, VERR_INVALID_POINTER);
+
     return VINF_SUCCESS;
 }