Changeset 108449 in vbox

Timestamp:

Mar 5, 2025 9:30:46 AM (2 months ago)

Author:

vboxsync

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

167823

Message:

VMM/GIC: bugref:10404 Minor fixes to reading, writing GICD_ICFGR<n> and GICD_ICFGR<n>E.

File:

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

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

@@ -1066 +1066 @@
 static VBOXSTRICTRC gicDistReadIntrConfigReg(PCGICDEV pGicDev, uint16_t idxReg, uint32_t *puValue)
 {
-    /* SGIs are read-only and are always edge-triggered. */
-    if (idxReg > 0)
+    /* When affinity routing is enabled SGIs and PPIs, reads to SGIs and PPIs return 0. */
+    Assert(pGicDev->fAffRoutingEnabled);
+    if (idxReg >= 2)
     {
         Assert(idxReg < RT_ELEMENTS(pGicDev->bmIntrConfig));
@@ -1073 +1074 @@
     }
     else
-        *puValue = 0xaaaaaaaa;
+        AssertReleaseFailed();
     LogFlowFunc(("idxReg=%#x read %#x\n", idxReg, pGicDev->bmIntrConfig[idxReg]));
     return VINF_SUCCESS;
@@ -1089 +1090 @@
 static VBOXSTRICTRC gicDistWriteIntrConfigReg(PGICDEV pGicDev, uint16_t idxReg, uint32_t uValue)
 {
-    /* Writes to SGIs are ignored. */
-    if (idxReg > 0)
+    /* When affinity routing is enabled SGIs and PPIs, writes to SGIs and PPIs are ignored. */
+    Assert(pGicDev->fAffRoutingEnabled);
+    if (idxReg >= 2)
     {
         Assert(idxReg < RT_ELEMENTS(pGicDev->bmIntrConfig));
@@ -1118 +1120 @@
         Assert(idxReg < RT_ELEMENTS(pGicDev->bmIntrGroup));
         *puValue = pGicDev->bmIntrGroup[idxReg];
-        LogFlowFunc(("idxReg=%#x read %#x\n", idxReg, *puValue));
     }
     else
         AssertReleaseFailed();
+    LogFlowFunc(("idxReg=%#x read %#x\n", idxReg, *puValue));
     return VINF_SUCCESS;
 }