Changeset 108483 in vbox for trunk/src

Timestamp:

Mar 10, 2025 7:00:57 AM (2 months ago)

Author:

vboxsync

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

167871

Message:

VMM/GIC: bugref:10404 CFGM leaf validation nits and rename.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GICAll.cpp (modified) (2 diffs)
• VMMR3/GICR3.cpp (modified) (5 diffs)
• include/GICInternal.h (modified) (1 diff)

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

@@ -2314 +2314 @@
                      /*| GIC_DIST_REG_TYPER_MBIS */           /** @todo Support message-based interrupts */
                      /*| GIC_DIST_REG_TYPER_LPIS */           /** @todo Support LPIs */
-                     | (pGicDev->fRangeSelSupport ? GIC_DIST_REG_TYPER_RSS : 0)
+                     | (pGicDev->fRangeSel ? GIC_DIST_REG_TYPER_RSS : 0)
                      | GIC_DIST_REG_TYPER_IDBITS_SET(16);    /* We only support 16-bit interrupt IDs. */
             if (pGicDev->fExtSpi)
@@ -3913 +3913 @@
                       | ARMV8_ICC_CTLR_EL1_AARCH64_PRIBITS_SET(4)
                       | ARMV8_ICC_CTLR_EL1_AARCH64_IDBITS_SET(ARMV8_ICC_CTLR_EL1_AARCH64_IDBITS_16BITS)
-                      | (pGicDev->fRangeSelSupport ? ARMV8_ICC_CTLR_EL1_AARCH64_RSS : 0);
+                      | (pGicDev->fRangeSel ? ARMV8_ICC_CTLR_EL1_AARCH64_RSS : 0);
 
     pGicCpu->bIntrPriorityMask  = 0; /* Means no interrupt gets through to the PE. */

trunk/src/VBox/VMM/VMMR3/GICR3.cpp

@@ -97 +97 @@
     pHlp->pfnPrintf(pHlp, "  uMaxExtPpi       = %u (upto IntId %u)\n", pGicDev->uMaxExtPpi,
                     pGicDev->uMaxExtPpi == GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1087 ? 1087 : GIC_INTID_RANGE_EXT_PPI_LAST);
-    pHlp->pfnPrintf(pHlp, "  fRangeSelSupport = %RTbool\n", pGicDev->fRangeSelSupport);
+    pHlp->pfnPrintf(pHlp, "  fRangeSelSupport = %RTbool\n", pGicDev->fRangeSel);
     pHlp->pfnPrintf(pHlp, "  fNmi             = %RTbool\n", pGicDev->fNmi);
     pHlp->pfnPrintf(pHlp, "  fMbi             = %RTbool\n", pGicDev->fMbi);
@@ -405 +405 @@
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fExtPpi);
     pHlp->pfnSSMPutU8(pSSM,   pGicDev->uMaxExtPpi);
-    pHlp->pfnSSMPutBool(pSSM, pGicDev->fRangeSelSupport);
+    pHlp->pfnSSMPutBool(pSSM, pGicDev->fRangeSel);
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fNmi);
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fMbi);
@@ -543 +543 @@
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fExtPpi);
     pHlp->pfnSSMGetU8(pSSM,   &pGicDev->uMaxExtPpi);
-    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fRangeSelSupport);
+    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fRangeSel);
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fNmi);
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fMbi);
@@ -695 +695 @@
     PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "DistributorMmioBase|RedistributorMmioBase|ItsMmioBase"
                                            "|ArchRev"
+                                           "|MaxSpi"
+                                           "|ExtSpi"
+                                           "|MaxExtSpi"
+                                           "|ExtPpi"
+                                           "|MaxExtPpi"
+                                           "|RangeSel"
                                            "|Nmi"
-                                           "|MaxSpi"
-                                           "|MaxExtSpi"
-                                           "|PpiNum", "");
+                                           "|Mbi", "");
 
 #if 0
@@ -784 +788 @@
      * Configures whether range-selector support is enabled (GICD_TYPER.RSS and
      * ICC_CTLR_EL1.RSS). */
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "RangeSelSupport", &pGicDev->fRangeSelSupport, true);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "RangeSel", &pGicDev->fRangeSel, true);
     AssertLogRelRCReturn(rc, rc);
 

trunk/src/VBox/VMM/include/GICInternal.h

@@ -181 +181 @@
     uint8_t                     uMaxExtPpi;
     /** Whether range-selector is supported (GICD_TYPER.RSS and ICC_CTLR_EL1.RSS). */
-    bool                        fRangeSelSupport;
+    bool                        fRangeSel;
     /** Whether NMIs are supported (GICD_TYPER.NMI). */
     bool                        fNmi;