Changeset 88416 in vbox

Timestamp:

Apr 8, 2021 1:27:05 PM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 WIP.

File:

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

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

@@ -449 +449 @@
 
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
+/**
+ * Gets the number of supported adjusted guest-address width (SAGAW) in bits given a
+ * CAP_REG.SAGAW value.
+ *
+ * @returns Number of SAGAW bits.
+ * @param   uSagaw  The CAP_REG.SAGAW value.
+ */
+DECLINLINE(uint8_t) vtdGetSupGstAddrBits(uint8_t uSagaw)
+{
+    if (uSagaw > 0 && uSagaw < 4)
+        return uSagaw + 2;
+    return 0;
+}
+
 
 /**
@@ -1013 +1027 @@
     uint64_t const fCap     = dmarRegRead64(pThis, VTD_MMIO_OFF_CAP_REG);
     uint64_t const fExtCap  = dmarRegRead64(pThis, VTD_MMIO_OFF_ECAP_REG);
-    uint8_t const  uMaxGstAddrWidth = RT_BF_GET(fCap, VTD_BF_CAP_REG_MGAW) + 1;
-    LogRel(("%s: CAP=%#RX64 ECAP=%#RX64 (MGAW=%u)\n", DMAR_LOG_PFX, fCap, fExtCap, uMaxGstAddrWidth));
+    uint8_t const  uMaxGstAddrBits = RT_BF_GET(fCap, VTD_BF_CAP_REG_MGAW) + 1;
+    uint8_t const  uSupGstAddrBits = vtdGetSupGstAddrBits(RT_BF_GET(fCap, VTD_BF_CAP_REG_SAGAW));
+    LogRel(("%s: CAP=%#RX64 ECAP=%#RX64 (MGAW=%u bits, SAGAW=%u bits)\n", DMAR_LOG_PFX, fCap, fExtCap, uMaxGstAddrBits,
+            uSupGstAddrBits));
     return VINF_SUCCESS;
 }