Changeset 108751 in vbox for trunk/src

Timestamp:

Mar 26, 2025 10:33:33 AM (3 weeks ago)

Author:

vboxsync

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

168176

Message:

VMM/GIC: bugref:10877 GITS PIDR2 register reads and related nits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GICAll.cpp (modified) (5 diffs)
• VMMAll/GITSAll.cpp (modified) (5 diffs)
• VMMR3/GICR3.cpp (modified) (4 diffs)
• include/GITSInternal.h (modified) (1 diff)

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

@@ -2033 +2033 @@
         }
         case GIC_DIST_REG_PIDR2_OFF:
-            Assert(pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCH_REV_GICV4);
-            *puValue = GIC_DIST_REG_PIDR2_ARCH_REV_SET(pGicDev->uArchRev);
+            Assert(pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCHREV_GICV4);
+            *puValue = GIC_DIST_REG_PIDR2_ARCHREV_SET(pGicDev->uArchRev);
             break;
         case GIC_DIST_REG_IIDR_OFF:
@@ -2283 +2283 @@
             break;
         case GIC_REDIST_REG_PIDR2_OFF:
-            Assert(pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCH_REV_GICV4);
-            *puValue = GIC_REDIST_REG_PIDR2_ARCH_REV_SET(pGicDev->uArchRev);
+            Assert(pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCHREV_GICV4);
+            *puValue = GIC_REDIST_REG_PIDR2_ARCHREV_SET(pGicDev->uArchRev);
             break;
         case GIC_REDIST_REG_CTLR_OFF:
@@ -3026 +3026 @@
     LogFlowFunc(("\n"));
     PGICDEV  pGicDev  = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
-    PGITSDEV pGitsDev = &pGicDev->Gits;
 
     RT_ZERO(pGicDev->bmIntrGroup);
@@ -3041 +3040 @@
     RT_ZERO(pGicDev->bmLpiPending);
     RT_ZERO(pGicDev->abLpiConfig);
+
+    PGITSDEV pGitsDev = &pGicDev->Gits;
     gitsInit(pGitsDev);
 }
@@ -3242 +3243 @@
     Assert(!(off & 0x3));
     Assert(cb == 4); RT_NOREF_PV(cb);
-
-    AssertReleaseFailed();
 
     PCGICDEV  pGicDev  = PDMDEVINS_2_DATA(pDevIns, PCGICDEV);

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

@@ -34 +34 @@
 
 #include <VBox/log.h>
+#include <VBox/gic.h>
 #include <iprt/errcore.h>       /* VINF_SUCCESS */
 #include <iprt/string.h>        /* RT_ZERO */
@@ -104 +105 @@
             *puValue = pGitsDev->fUnmappedMsiReporting;
             break;
+        case GITS_CTRL_REG_PIDR2_OFF:
+        {
+            Assert(pGitsDev->uArchRev <= GITS_CTRL_REG_PIDR2_ARCHREV_GICV4);
+            uint8_t const uIdCodeDes1 = GIC_JEDEC_JEP10_DES_1(GIC_JEDEC_JEP106_IDENTIFICATION_CODE);
+            *puValue = RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_DES_1,   uIdCodeDes1)
+                     | RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_JEDEC,   1)
+                     | RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_ARCHREV, pGitsDev->uArchRev);
+            break;
+        }
         default:
-            AssertReleaseFailed();
+            AssertReleaseMsgFailed(("offReg=%#x\n", offReg));
+            break;
     }
 
@@ -115 +126 @@
 {
     RT_NOREF(pGitsDev, offReg, puValue);
+    AssertReleaseMsgFailed(("offReg=%#x\n", offReg));
     return VERR_NOT_IMPLEMENTED;
 }
@@ -122 +134 @@
 {
     RT_NOREF(pGitsDev, offReg, uValue);
+    AssertReleaseMsgFailed(("offReg=%#x uValue=%#RX32\n", offReg, uValue));
     return VERR_NOT_IMPLEMENTED;
 }
@@ -129 +142 @@
 {
     RT_NOREF(pGitsDev, offReg, uValue);
+    AssertReleaseMsgFailed(("offReg=%#x uValue=%#RX32\n", offReg, uValue));
     return VERR_NOT_IMPLEMENTED;
 }

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

@@ -499 +499 @@
      * Finally, perform sanity checks.
      */
-    if (pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCH_REV_GICV4)
+    if (pGicDev->uArchRev <= GIC_DIST_REG_PIDR2_ARCHREV_GICV4)
     { /* likely */ }
     else
         return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS, N_("Invalid uArchRev, got %u expected range [1,31]"), pGicDev->uArchRev,
-                                       GIC_DIST_REG_PIDR2_ARCH_REV_GICV1, GIC_DIST_REG_PIDR2_ARCH_REV_GICV4);
+                                       GIC_DIST_REG_PIDR2_ARCHREV_GICV1, GIC_DIST_REG_PIDR2_ARCHREV_GICV4);
     if (pGicDev->uMaxSpi - 1 < 31)
     { /* likely */ }
@@ -611 +611 @@
 
     /** @devcfgm{gic, ArchRev, uint8_t, 3}
-     * Configures the GIC architecture revision (GICD_PIDR2.ArchRev and
-     * GICR_PIDR2.ArchRev).
+     * Configures the GIC architecture revision (GICD_PIDR2.ArchRev, GICR_PIDR2.ArchRev
+     * and GITS_PIDR2.ArchRev).
      *
-     * Currently we only support GICv3. */
+     * Currently we only support GICv3 and the architecture revision reported is the
+     * same for both the GIC and the ITS. */
     int rc = pHlp->pfnCFGMQueryU8Def(pCfg, "ArchRev", &pGicDev->uArchRev, 3);
     AssertLogRelRCReturn(rc, rc);
     if (pGicDev->uArchRev == 3)
-    { /* likely */ }
+        pGicDev->Gits.uArchRev = pGicDev->uArchRev;
     else
         return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
@@ -696 +697 @@
      * Configures whether non-maskable interrupts (NMIs) are supported
      * (GICD_TYPER.NMI). */
+    /** @todo NMIs are currently not implemented. */
     rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Nmi", &pGicDev->fNmi, false);
     AssertLogRelRCReturn(rc, rc);
 
-    /** @devcfgm{gic, Mbi, bool, true}
+    /** @devcfgm{gic, Mbi, bool, false}
      * Configures whether message-based interrupts (MBIs) are supported
-     * (GICD_TYPER.MBIS). */
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Mbi", &pGicDev->fMbi, true);
+     * (GICD_TYPER.MBIS).
+     *
+     * Guests typically can't use MBIs without an ITS. */
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Mbi", &pGicDev->fMbi, false);
     AssertLogRelRCReturn(rc, rc);
 
@@ -711 +715 @@
     AssertLogRelRCReturn(rc, rc);
 
-    /** @devcfgm{gic, Lpi, bool, true}
+    /** @devcfgm{gic, Lpi, bool, false}
      * Configures whether physical LPIs are supported (GICD_TYPER.LPIS and
-     * GICR_TYPER.PLPIS). */
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Lpi", &pGicDev->fLpi, true);
+     * GICR_TYPER.PLPIS).
+     *
+     * This currently requires an ITS as we do not support direction injection of
+     * LPIs as most guests do not use them anyway. */
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Lpi", &pGicDev->fLpi, false);
     AssertLogRelRCReturn(rc, rc);
 

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

@@ -84 +84 @@
      * @{ */
     /** @} */
+
+    /** @name Configurables.
+     * @{ */
+    /** The ITS architecture (GITS_PIDR2.ArchRev). */
+    uint8_t                 uArchRev;
+    /** Padding. */
+    uint8_t                 afPadding0[7];
+    /** @} */
 } GITSDEV;
 /** Pointer to a GITS device. */