Changeset 107957 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 28, 2025 8:38:40 AM (3 months ago)

Author:

vboxsync

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

167204

Message:

VMM/GIC: bugref:10404 Some register renaming, minor bits.

File:

• trunk/src/VBox/VMM/VMMR3/GICR3.cpp (modified) (4 diffs)

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

@@ -50 +50 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-/** Some ancient version... */
+/** GIC saved state version. */
 #define GIC_SAVED_STATE_VERSION                     1
 
@@ -396 +396 @@
      * Validate GIC settings.
      */
-    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "DistributorMmioBase|RedistributorMmioBase|ItsMmioBase|ItLinesNumber", "");
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "DistributorMmioBase|RedistributorMmioBase|ItsMmioBase"
+                                           "|ArchRev"
+                                           "|ArchExtNmi"
+                                           "|ItLinesNumber", "");
 
 #if 0
@@ -407 +410 @@
     int rc;
 #endif
+
+    /** @devcfgm{gic, ArchRev, uint8_t, 3}
+     * Configures the GIC architecture revision (GICD_PIDR2.ArchRev and
+     * GICR_PIDR2.ArchRev).
+     *
+     * Currently we only support GICv3. */
+    rc = pHlp->pfnCFGMQueryU8Def(pCfg, "ArchRev", &pGicDev->uArchRev, 3);
+    AssertLogRelRCReturn(rc, rc);
+    if (pGicDev->uArchRev == 3)
+    { /* likely */ }
+    else
+        return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                                   N_("Configuration error: \"ArchRev\" %u is not supported"), pGicDev->uArchRev);
+
+    /** @devcfgm{gic, ArchExtNmi, bool, false}
+     * Configures whether NMIs are supported (GICD_TYPER.NMI). */
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "ArchExtNmi", &pGicDev->fNmi, false);
+    AssertLogRelRCReturn(rc, rc);
+    if (   !pGicDev->fNmi
+        || pGicDev->uArchRev >= 3)
+    { /* likely */ }
+    else
+        return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                                   N_("Configuration error: \"ArchExtNmi\" requires architecture revision v3 or newer"));
 
     /** @devcfgm{gic, ItLinesNumber, uint16_t, 1}
@@ -413 +440 @@
      * For the INTID range 32-1023, configures the maximum SPI supported. Valid values
      * are [1, 31] which equates to interrupt IDs [63, 1023]. A value of 0 indicates no
-     * SPIs are supported, we do not allow configuring this value as it's expected most
+     * SPIs are supported. We do not allow configuring this value as it's expected most
      * guests would assume support for SPIs. */
     rc = pHlp->pfnCFGMQueryU16Def(pCfg, "ItLinesNumber", &pGicDev->uItLinesNumber, 1 /* 63 interrupt IDs */);