Changeset 108527 in vbox for trunk/src/VBox/VMM/VMMAll/GICAll.cpp

Timestamp:

Mar 12, 2025 7:47:59 AM (6 weeks ago)

Author:

vboxsync

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

167917

Message:

VMM/GIC: bugref:10404 More cleanups.

File:

• trunk/src/VBox/VMM/VMMAll/GICAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -695 +695 @@
  * @returns Strict VBox status code.
  * @param   pGicDev     The GIC distributor state.
- * @param   offReg      The offset of the register in the distributor register map.
  * @param   idxReg      The index of the register in the GICD_IROUTER range.
  * @param   uValue      The value to write to the register.
  */
-static VBOXSTRICTRC gicDistWriteIntrRoutingReg(PGICDEV pGicDev, uint16_t offReg, uint16_t idxReg, uint32_t uValue)
+static VBOXSTRICTRC gicDistWriteIntrRoutingReg(PGICDEV pGicDev, uint16_t idxReg, uint32_t uValue)
 {
     /* When affinity routing is disabled, writes are ignored. */
@@ -708 +707 @@
     AssertReturn(idxReg < RT_ELEMENTS(pGicDev->au32IntrRouting), VERR_BUFFER_OVERFLOW);
     Assert(idxReg < sizeof(pGicDev->bmIntrRoutingMode) * 8);
-    if (!(offReg & 4))
+    if (!(idxReg % 2))
     {
         /* Lower 32-bits. */
@@ -2082 +2081 @@
     {
         uint16_t const idxReg = (offReg - GIC_DIST_REG_IROUTERn_OFF_START) / cbReg;
-        return gicDistWriteIntrRoutingReg(pGicDev, offReg, idxReg, uValue);
+        return gicDistWriteIntrRoutingReg(pGicDev, idxReg, uValue);
     }
     if (offReg - GIC_DIST_REG_IROUTERnE_OFF_START < GIC_DIST_REG_IROUTERnE_RANGE_SIZE)
@@ -2088 +2087 @@
         uint16_t const idxExt = RT_ELEMENTS(pGicDev->au32IntrRouting) / 2;
         uint16_t const idxReg = idxExt + (offReg - GIC_DIST_REG_IROUTERnE_OFF_START) / cbReg;
-        return gicDistWriteIntrRoutingReg(pGicDev, offReg, idxReg, uValue);
+        return gicDistWriteIntrRoutingReg(pGicDev, idxReg, uValue);
     }