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

Timestamp:

Mar 10, 2025 8:24:03 AM (6 weeks ago)

Author:

vboxsync

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

167874

Message:

VMM/GIC: bugref:10404 Fixed register offset typo for GICD_ICFGRn fixes and ignore writes to ICC_AP0R[0-3] and ICC_AP1R[0-3] registers.

File:

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

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

@@ -2312 +2312 @@
                      /*| GIC_DIST_REG_TYPER_NMI*/             /** @todo Support non-maskable interrupts */
                      /*| GIC_DIST_REG_TYPER_SECURITY_EXTN */  /** @todo Support dual security states. */
-                     /*| GIC_DIST_REG_TYPER_MBIS */           /** @todo Support message-based interrupts */
+                     | (pGicDev->fMbi ? GIC_DIST_REG_TYPER_MBIS : 0)
                      /*| GIC_DIST_REG_TYPER_LPIS */           /** @todo Support LPIs */
                      | (pGicDev->fRangeSel ? GIC_DIST_REG_TYPER_RSS : 0)
@@ -2379 +2379 @@
             AssertReleaseFailed();
             break;
+#if 0
         case GIC_DIST_REG_ICFGRn_OFF_START: /* Only 32 lines for now. */
             AssertReleaseFailed();
             break;
+#endif
         case GIC_DIST_REG_IGRPMODRn_OFF_START: /* Only 32 lines for now. */
             AssertReleaseFailed();
@@ -2588 +2590 @@
      */
     {
-        if (offReg - GIC_DIST_REG_ICFGRn_OFF_START + cbReg < GIC_DIST_REG_ICFGRn_RANGE_SIZE)
+        if (offReg - GIC_DIST_REG_ICFGRn_OFF_START < GIC_DIST_REG_ICFGRn_RANGE_SIZE)
         {
             uint16_t const idxReg = (offReg - GIC_DIST_REG_ICFGRn_OFF_START) / cbReg;
@@ -3654 +3656 @@
             break;
         case ARMV8_AARCH64_SYSREG_ICC_AP0R0_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP0R1_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP0R2_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP0R3_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP1R0_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP1R1_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP1R2_EL1:
-            AssertReleaseFailed();
-            break;
         case ARMV8_AARCH64_SYSREG_ICC_AP1R3_EL1:
-            AssertReleaseFailed();
+            /* Writes ignored, well behaving guest would write all 0s or the last read value of the register. */
             break;
         case ARMV8_AARCH64_SYSREG_ICC_NMIAR1_EL1: