Changeset 88224 in vbox

Timestamp:

Mar 22, 2021 6:19:50 AM (4 years ago)

Author:

vboxsync

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

143411

Message:

Intel IOMMU: bugref:9967 WIP.

File:

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

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

@@ -342 +342 @@
 
 /** Array of RW masks for all register groups. */
-static const uint8_t *g_pabRwMasks[]   = { (uint8_t *)&g_au32RwMasks0[0], (uint8_t *)&g_au32RwMasks1[0] };
+static const uint8_t *g_apbRwMasks[]   = { (uint8_t *)&g_au32RwMasks0[0], (uint8_t *)&g_au32RwMasks1[0] };
 
 /** Array of RW1C masks for all register groups. */
-static const uint8_t *g_pabRw1cMasks[] = { (uint8_t *)&g_au32Rw1cMasks0[0], (uint8_t *)&g_au32Rw1cMasks1[0] };
+static const uint8_t *g_apbRw1cMasks[] = { (uint8_t *)&g_au32Rw1cMasks0[0], (uint8_t *)&g_au32Rw1cMasks1[0] };
 
 
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
-static uint8_t * iommuIntelRegGetGroup(PIOMMU pThis, uint16_t offReg, uint8_t cbReg, uint8_t *pIdxGroup)
+DECLINLINE(uint8_t *) iommuIntelRegGetGroup(PIOMMU pThis, uint16_t offReg, uint8_t cbReg, uint8_t *pIdxGroup)
 {
     AssertCompile(VTD_MMIO_GROUP_0_OFF_FIRST == 0);
@@ -385 +385 @@
     uint8_t idxGroup;
     uint8_t const *pabRegs      = iommuIntelRegGetGroup(pThis, offReg, sizeof(uint64_t), &idxGroup);
-    uint8_t const *pabRwMasks   = g_pabRwMasks[idxGroup];
-    uint8_t const *pabRw1cMasks = g_pabRw1cMasks[idxGroup];
+    uint8_t const *pabRwMasks   = g_apbRwMasks[idxGroup];
+    uint8_t const *pabRw1cMasks = g_apbRw1cMasks[idxGroup];
     *puReg      = *(uint64_t *)(pabRegs      + offReg);
     *pfRwMask   = *(uint64_t *)(pabRwMasks   + offReg);
@@ -397 +397 @@
     uint8_t idxGroup;
     uint8_t const *pabRegs      = iommuIntelRegGetGroup(pThis, offReg, sizeof(uint32_t), &idxGroup);
-    uint8_t const *pabRwMasks   = g_pabRwMasks[idxGroup];
-    uint8_t const *pabRw1cMasks = g_pabRw1cMasks[idxGroup];
+    uint8_t const *pabRwMasks   = g_apbRwMasks[idxGroup];
+    uint8_t const *pabRw1cMasks = g_apbRw1cMasks[idxGroup];
     *puReg      = *(uint32_t *)(pabRegs      + offReg);
     *pfRwMask   = *(uint32_t *)(pabRwMasks   + offReg);
@@ -452 +452 @@
 
 
-static uint64_t iommuIntelRegRead32(PIOMMU pThis, uint16_t offReg)
+static uint32_t iommuIntelRegRead32(PIOMMU pThis, uint16_t offReg)
 {
     uint32_t uCurReg;