Changeset 88697 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2021 7:21:39 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Comments and nits.

File:

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

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

@@ -974 +974 @@
  *
  * @returns @c true if the fault can be recorded, @c false otherwise.
- * @param   pThis   The shared DMAR device state.
- */
-static bool dmarPrimaryFaultCanRecord(PDMAR pThis)
-{
+ * @param   pDevIns     The IOMMU device instance.
+ * @param   pThis       The shared DMAR device state.
+ */
+static bool dmarPrimaryFaultCanRecord(PPDMDEVINS pDevIns, PDMAR pThis)
+{
+    PCDMARCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PCDMARCC);
+    DMAR_ASSERT_LOCK_IS_OWNER(pDevIns, pThisCC);
+
     uint32_t uFstsReg = dmarRegReadRaw32(pThis, VTD_MMIO_OFF_FSTS_REG);
     if (uFstsReg & VTD_BF_FSTS_REG_PFO_MASK)
@@ -1268 +1272 @@
         switch (off)
         {
-            case VTD_MMIO_OFF_GCMD_REG:
+            case VTD_MMIO_OFF_GCMD_REG:         /* 32-bit */
             {
                 rcStrict = dmarGcmdRegWrite(pDevIns, uRegWritten);
@@ -1274 +1278 @@
             }
 
-            case VTD_MMIO_OFF_CCMD_REG:
+            case VTD_MMIO_OFF_CCMD_REG:         /* 64-bit */
             case VTD_MMIO_OFF_CCMD_REG + 4:
             {
@@ -1281 +1285 @@
             }
 
-            case VTD_MMIO_OFF_IQT_REG:
-            /*   VTD_MMIO_OFF_IQT_REG + 4: (RsvdZ) */
+            case VTD_MMIO_OFF_IQT_REG:          /* 64-bit */
+            /*   VTD_MMIO_OFF_IQT_REG + 4: */   /* High 32-bits reserved. */
             {
                 rcStrict = dmarIqtRegWrite(pDevIns, offReg, uRegWritten);
@@ -1288 +1292 @@
             }
 
-            case VTD_MMIO_OFF_IQA_REG:
-            /*   VTD_MMIO_OFF_IQA_REG + 4: (Data) */
+            case VTD_MMIO_OFF_IQA_REG:          /* 64-bit */
+            /*   VTD_MMIO_OFF_IQA_REG + 4: */   /* High 32-bits data. */
             {
                 rcStrict = dmarIqaRegWrite(pDevIns, offReg, uRegWritten);