Changeset 108823 in vbox for trunk/src

Timestamp:

Apr 2, 2025 6:04:51 AM (13 days ago)

Author:

vboxsync

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

168269

Message:

VMM/GIC: bugref:10877 Minor architecture revision is being configured by Main now, handle it in GIC.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/GICR3.cpp (modified) (9 diffs)
• include/GICInternal.h (modified) (2 diffs)

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

@@ -51 +51 @@
 *********************************************************************************************************************************/
 /** GIC saved state version. */
-#define GIC_SAVED_STATE_VERSION                     7
+#define GIC_SAVED_STATE_VERSION                     8
 
 # define GIC_SYSREGRANGE(a_uFirst, a_uLast, a_szName) \
@@ -91 +91 @@
     pHlp->pfnPrintf(pHlp, "GIC:\n");
     pHlp->pfnPrintf(pHlp, "  uArchRev         = %u\n",      pGicDev->uArchRev);
+    pHlp->pfnPrintf(pHlp, "  uArchRevMinor    = %u\n",      pGicDev->uArchRevMinor);
     pHlp->pfnPrintf(pHlp, "  uMaxSpi          = %u (upto IntId %u)\n", pGicDev->uMaxSpi, 32 * (pGicDev->uMaxSpi + 1));
     pHlp->pfnPrintf(pHlp, "  fExtSpi          = %RTbool\n", pGicDev->fExtSpi);
@@ -311 +312 @@
     pHlp->pfnSSMPutU32(pSSM,  pVM->cCpus);
     pHlp->pfnSSMPutU8(pSSM,   pGicDev->uArchRev);
+    pHlp->pfnSSMPutU8(pSSM,   pGicDev->uArchRevMinor);
     pHlp->pfnSSMPutU8(pSSM,   pGicDev->uMaxSpi);
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fExtSpi);
@@ -404 +406 @@
     PGICDEV pGicDev = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
     pHlp->pfnSSMGetU8(pSSM,   &pGicDev->uArchRev);
+    pHlp->pfnSSMGetU8(pSSM,   &pGicDev->uArchRevMinor);
     pHlp->pfnSSMGetU8(pSSM,   &pGicDev->uMaxSpi);
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fExtSpi);
@@ -504 +507 @@
         return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS, N_("Invalid uArchRev, got %u expected range [1,31]"), pGicDev->uArchRev,
                                        GIC_DIST_REG_PIDR2_ARCHREV_GICV1, GIC_DIST_REG_PIDR2_ARCHREV_GICV4);
+    if (pGicDev->uArchRevMinor == 1)
+    { /* likely */ }
+    else
+        return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS, N_("Invalid uArchRevMinor, got %u expected 1"), pGicDev->uArchRevMinor);
     if (pGicDev->uMaxSpi - 1 < 31)
     { /* likely */ }
@@ -590 +597 @@
     PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "DistributorMmioBase|RedistributorMmioBase|ItsMmioBase"
                                            "|ArchRev"
+                                           "|ArchRevMinor"
                                            "|MaxSpi"
                                            "|ExtSpi"
@@ -618 +626 @@
     int rc = pHlp->pfnCFGMQueryU8Def(pCfg, "ArchRev", &pGicDev->uArchRev, 3);
     AssertLogRelRCReturn(rc, rc);
-    if (pGicDev->uArchRev == 3)
+    if (pGicDev->uArchRev == GIC_DIST_REG_PIDR2_ARCHREV_GICV3)
         pGicDev->Gits.uArchRev = pGicDev->uArchRev;
     else
         return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                                   N_("Configuration error: \"ArchRev\" value %u is not supported"), pGicDev->uArchRev);
+                                   N_("Configuration error: \"ArchRev\" must be %u, other revisions not supported"),
+                                   GIC_DIST_REG_PIDR2_ARCHREV_GICV3);
+
+    /** @devcfgm{gic, ArchRevMinor, uint8_t, 1}
+     * Configures the GIC architecture revision minor version.
+     *
+     * Currently we support GICv3.1 only. GICv3.1's only addition to GICv3 is supported
+     * for extended INTID ranges which we currently always support. */
+    rc = pHlp->pfnCFGMQueryU8Def(pCfg, "ArchRevMinor", &pGicDev->uArchRevMinor, 1);
+    AssertLogRelRCReturn(rc, rc);
+    if (pGicDev->uArchRevMinor == 1)
+    { /* likely */ }
+    else
+        return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                                   N_("Configuration error: \"ArchRevMinor\" must be 1, other minor revisions not supported"));
 
     /** @devcfgm{gic, MaxSpi, uint8_t, 31}
@@ -688 +710 @@
                                    N_("Configuration error: \"MaxExtPpi\" must be in the range [0,2]"));
 
-    /** @devcfgm{gic, RangeSelSupport, bool, true}
+    /** @devcfgm{gic, RangeSel, bool, true}
      * Configures whether range-selector support is enabled (GICD_TYPER.RSS and
      * ICC_CTLR_EL1.RSS). */
@@ -882 +904 @@
      * Log features/config.
      */
-    uint8_t const uArchRev     = pGicDev->uArchRev;
-    uint8_t const uMaxSpi      = pGicDev->uMaxSpi;
-    bool const    fExtSpi      = pGicDev->fExtSpi;
-    uint8_t const uMaxExtSpi   = pGicDev->uMaxExtSpi;
-    bool const    fExtPpi      = pGicDev->fExtPpi;
-    uint8_t const uMaxExtPpi   = pGicDev->uMaxExtPpi;
-    bool const fRangeSel       = pGicDev->fRangeSel;
-    bool const fNmi            = pGicDev->fNmi;
-    bool const fMbi            = pGicDev->fMbi;
-    bool const fAff3Levels     = pGicDev->fAff3Levels;
-    bool const fLpi            = pGicDev->fLpi;
-    uint16_t const uExtPpiLast = uMaxExtPpi == GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1087 ? 1087 : GIC_INTID_RANGE_EXT_PPI_LAST;
-    LogRel(("GIC: ArchRev=%u RangeSel=%RTbool Nmi=%RTbool Mbi=%RTbool Aff3Levels=%RTbool Lpi=%RTbool\n",
-            uArchRev, fRangeSel, fNmi, fMbi, fAff3Levels, fLpi));
+    uint8_t const uArchRev      = pGicDev->uArchRev;
+    uint8_t const uArchRevMinor = pGicDev->uArchRevMinor;
+    uint8_t const uMaxSpi       = pGicDev->uMaxSpi;
+    bool const    fExtSpi       = pGicDev->fExtSpi;
+    uint8_t const uMaxExtSpi    = pGicDev->uMaxExtSpi;
+    bool const    fExtPpi       = pGicDev->fExtPpi;
+    uint8_t const uMaxExtPpi    = pGicDev->uMaxExtPpi;
+    bool const fRangeSel        = pGicDev->fRangeSel;
+    bool const fNmi             = pGicDev->fNmi;
+    bool const fMbi             = pGicDev->fMbi;
+    bool const fAff3Levels      = pGicDev->fAff3Levels;
+    bool const fLpi             = pGicDev->fLpi;
+    uint16_t const uExtPpiLast  = uMaxExtPpi == GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1087 ? 1087 : GIC_INTID_RANGE_EXT_PPI_LAST;
+    LogRel(("GIC: ArchRev=%u.%u RangeSel=%RTbool Nmi=%RTbool Mbi=%RTbool Aff3Levels=%RTbool Lpi=%RTbool\n",
+            uArchRev, uArchRevMinor, fRangeSel, fNmi, fMbi, fAff3Levels, fLpi));
     LogRel(("GIC: SPIs=true (%u:32..%u) ExtSPIs=%RTbool (%u:4095..%u) ExtPPIs=%RTbool (%u:1056..%u)\n",
             uMaxSpi, 32 * (uMaxSpi + 1),

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

@@ -106 +106 @@
     /** @name Configurables.
      * @{ */
-    /** The GIC architecture (GICD_PIDR2.ArchRev and GICR_PIDR2.ArchRev). */
+    /** The GIC architecture revision (GICD_PIDR2.ArchRev and GICR_PIDR2.ArchRev). */
     uint8_t                     uArchRev;
+    /** The GIC architecture minor revision (currently 1 as we only support GICv3.1). */
+    uint8_t                     uArchRevMinor;
     /** The maximum SPI supported (GICD_TYPER.ItLinesNumber). */
     uint8_t                     uMaxSpi;
@@ -132 +134 @@
     uint8_t                     uMaxLpi;
     /** Padding. */
-    bool                        afPadding[4];
+    bool                        afPadding[3];
     /** @} */