Changeset 88535 in vbox

Timestamp:

Apr 15, 2021 12:18:52 PM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 WIP.

File:

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

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

@@ -60 +60 @@
  *  minimum number of registers (which is 1).
  *
- *  See Intel VT-d spec. 10.4.2 "Capability Register" (CAP_REG::NFR). */
+ *  See Intel VT-d spec. 10.4.2 "Capability Register" (CAP_REG.NFR). */
 #define DMAR_FRCD_REG_COUNT                         UINT32_C(1)
 
@@ -90 +90 @@
 #define DMAR_MMIO_GROUP_1_SIZE                      (DMAR_MMIO_GROUP_1_OFF_END - DMAR_MMIO_GROUP_1_OFF_FIRST)
 
+/** DMAR implementation's major version number (exposed to software).
+ *  We report 6 as the major version since we support queued invalidations as
+ *  software may make assumptions based on that.
+ *
+ *  See Intel VT-d spec. 10.4.7 "Context Command Register" (CCMD_REG.CAIG). */
+#define DMAR_VER_MAJOR                              6
 /** DMAR implementation's minor version number (exposed to software). */
 #define DMAR_VER_MINOR                              0
-/** DMAR implementation's major version number (exposed to software). */
-#define DMAR_VER_MAJOR                              1
 /** @} */
 
@@ -125 +129 @@
     /** @name Register copies for a tiny bit faster and more convenient access.
      *  @{ */
+    /** Copy of VER_REG. */
+    uint8_t                     uVerReg;
+    /** Alignment. */
+    uint8_t                     abPadding[7];
     /** Copy of CAP_REG. */
     uint64_t                    fCap;
@@ -860 +868 @@
     /* VER_REG */
     {
-        uint8_t const uVer = RT_BF_MAKE(VTD_BF_VER_REG_MIN, DMAR_VER_MINOR)
-                           | RT_BF_MAKE(VTD_BF_VER_REG_MAX, DMAR_VER_MAJOR);
-        dmarRegWriteRaw64(pThis, VTD_MMIO_OFF_VER_REG, uVer);
+        pThis->uVerReg = RT_BF_MAKE(VTD_BF_VER_REG_MIN, DMAR_VER_MINOR)
+                       | RT_BF_MAKE(VTD_BF_VER_REG_MAX, DMAR_VER_MAJOR);
+        dmarRegWriteRaw64(pThis, VTD_MMIO_OFF_VER_REG, pThis->uVerReg);
     }
 
@@ -907 +915 @@
                     | RT_BF_MAKE(VTD_BF_CAP_REG_MAMV,    fPsi & fMamv)
                     | RT_BF_MAKE(VTD_BF_CAP_REG_DWD,     1)
+                    | RT_BF_MAKE(VTD_BF_CAP_REG_DRD,     1)
                     | RT_BF_MAKE(VTD_BF_CAP_REG_FL1GP,   fFlts & fFl1gp)
                     | RT_BF_MAKE(VTD_BF_CAP_REG_PI,      0)     /* Posted Interrupts not supported. */
@@ -1122 +1131 @@
      * Log some of the features exposed to software.
      */
-    uint32_t const uVerReg         = dmarRegRead32(pThis, VTD_MMIO_OFF_VER_REG);
+    uint32_t const uVerReg         = pThis->uVerReg;
     uint8_t const  cMaxGstAddrBits = RT_BF_GET(pThis->fCap, VTD_BF_CAP_REG_MGAW) + 1;
     uint8_t const  cSupGstAddrBits = vtdCapRegGetSagawBits(RT_BF_GET(pThis->fCap, VTD_BF_CAP_REG_SAGAW));