Changeset 108946 in vbox

Timestamp:

Apr 11, 2025 9:44:17 AM (4 weeks ago)

Author:

vboxsync

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

168457

Message:

VMM/GIC: bugref:10877 LPI work-in-progress.

Location:

trunk

Files:

• include/VBox/gic.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/GICAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (10 diffs)
• src/VBox/VMM/VMMR3/GICR3.cpp (modified) (5 diffs)
• src/VBox/VMM/include/GICInternal.h (modified) (1 diff)

trunk/include/VBox/gic.h ¶

@@ -723 +723 @@
 /** @} */
 
+
+/** @name LPI configuration table entry.
+ * @{ */
+/** GITS LPI Configuration   */
+/** GITS LPI CTE: Enable. */
+#define GITS_BF_LPI_CTE_ENABLE_SHIFT                            0
+#define GITS_BF_LPI_CTE_ENABLE_MASK                             UINT8_C(0x1)
+/** GITS LPI CTE: Reserved (bit 1). */
+#define GITS_BF_LPI_CTE_RSVD_1_SHIFT                            1
+#define GITS_BF_LPI_CTE_RSVD_1_MASK                             UINT8_C(0x2)
+/** GITS LPI CTE: Priority. */
+#define GITS_BF_LPI_CTE_PRIORITY_SHIFT                          2
+#define GITS_BF_LPI_CTE_PRIORITY_MASK                           UINT8_C(0xfc)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_LPI_CTE_, UINT8_C(0), UINT8_MAX,
+                            (ENABLE, RSVD_1, PRIORITY));
+/** @} */
+
 #endif /* !VBOX_INCLUDED_gic_h */
 

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

@@ -3110 +3110 @@
     RT_ZERO(pGicDev->bmLpiPending);
     pGicDev->uLpiConfigBaseReg.u = 0;
+    pGicDev->uLpiPendingBaseReg.u = 0;
     pGicDev->fEnableLpis = false;
 }

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

@@ -180 +180 @@
 
 
-#if 1
 static const char *gitsGetCommandName(uint8_t uCmdId)
 {
@@ -210 +209 @@
     }
 }
-#endif
-
-
-static void gitsCmdQueueSetError(PPDMDEVINS pDevIns, PGITSDEV pGitsDev, GITSDIAG enmError, bool fStallQueue)
-{
+
+
+DECL_FORCE_INLINE(const char *) gitsGetDiagDescription(GITSDIAG enmDiag)
+{
+    if (enmDiag < RT_ELEMENTS(g_apszGitsDiagDesc))
+        return g_apszGitsDiagDesc[enmDiag];
+    return "<Unknown>";
+}
+
+
+static void gitsCmdQueueSetError(PPDMDEVINS pDevIns, PGITSDEV pGitsDev, GITSDIAG enmDiag, bool fStallQueue)
+{
+    Log4Func(("enmDiag=%#RX32 (%s) fStallQueue=%RTbool\n", enmDiag, gitsGetDiagDescription(enmDiag)));
     GITS_CRIT_SECT_ENTER(pDevIns);
 
     /* Record the error and stall the queue. */
-    pGitsDev->enmDiag = enmError;
+    pGitsDev->enmDiag = enmDiag;
     pGitsDev->cCmdQueueErrors++;
     if (fStallQueue)
@@ -258 +265 @@
 static void gitsCmdQueueThreadWakeUpIfNeeded(PPDMDEVINS pDevIns, PGITSDEV pGitsDev)
 {
+    Log4Func(("\n"));
     Assert(GITS_CRIT_SECT_IS_OWNER(pDevIns));
     if (    gitsCmdQueueCanProcessRequests(pGitsDev)
         && !gitsCmdQueueIsEmpty(pGitsDev))
     {
+        Log4Func(("Waking up command-queue thread\n"));
         int const rc = PDMDevHlpSUPSemEventSignal(pDevIns, pGitsDev->hEvtCmdQueue);
         AssertRC(rc);
@@ -294 +303 @@
 
         case GITS_CTRL_REG_PIDR2_OFF:
-        {
             Assert(cb == 4);
             Assert(pGitsDev->uArchRev <= GITS_CTRL_REG_PIDR2_ARCHREV_GICV4);
-            uint8_t const uIdCodeDes1 = GIC_JEDEC_JEP10_DES_1(GIC_JEDEC_JEP106_IDENTIFICATION_CODE);
-            uReg = RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_DES_1,   uIdCodeDes1)
+            uReg = RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_DES_1,   GIC_JEDEC_JEP10_DES_1(GIC_JEDEC_JEP106_IDENTIFICATION_CODE))
                  | RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_JEDEC,   1)
                  | RT_BF_MAKE(GITS_BF_CTRL_REG_PIDR2_ARCHREV, pGitsDev->uArchRev);
             break;
-        }
 
         case GITS_CTRL_REG_IIDR_OFF:
@@ -312 +318 @@
         case GITS_CTRL_REG_TYPER_OFF:
         case GITS_CTRL_REG_TYPER_OFF + 4:
-        {
             uReg = pGitsDev->uTypeReg.u >> ((offReg & 7) << 3 /* to bits */);
             break;
-        }
 
         case GITS_CTRL_REG_CBASER_OFF:
@@ -361 +365 @@
     Assert(cb == 8 || cb == 4);
     Assert(!(offReg & 3));
+    Log4Func(("offReg=%u uValue=%#RX64 cb=%u\n", offReg, uValue, cb));
 
     /*
@@ -435 +440 @@
     Assert(cb == 8 || cb == 4);
     Assert(!(offReg & 3));
+    Log4Func(("offReg=%u uValue=%#RX64 cb=%u\n", offReg, uValue, cb));
     AssertReleaseMsgFailed(("offReg=%#x uValue=%#RX64 [%u-bit]\n", offReg, uValue, cb << 3));
 }
@@ -496 +502 @@
     /* Basic info, GITS_CTLR and GITS_TYPER. */
     {
-        GITSDIAG const    enmDiag  = pGitsDev->enmDiag;
-        const char *const pszDiag  = enmDiag < RT_ELEMENTS(g_apszGitsDiagDesc) ? g_apszGitsDiagDesc[enmDiag] : "(Unknown)";
-        uint32_t const    uCtrlReg = pGitsDev->uCtrlReg;
+        uint32_t const uCtrlReg = pGitsDev->uCtrlReg;
+        GITSDIAG const enmDiag  = pGitsDev->enmDiag;
         pHlp->pfnPrintf(pHlp, "  uArchRev           = %u\n",          pGitsDev->uArchRev);
-        pHlp->pfnPrintf(pHlp, "  Errors             = %RU64\n",       pGitsDev->cCmdQueueErrors);
-        pHlp->pfnPrintf(pHlp, "  Diagnostic         = %#RX32 (%s)\n", enmDiag, pszDiag);
+        pHlp->pfnPrintf(pHlp, "  Cmd queue errors   = %RU64\n",       pGitsDev->cCmdQueueErrors);
+        pHlp->pfnPrintf(pHlp, "  Last error         = %#RX32 (%s)\n", enmDiag, gitsGetDiagDescription(enmDiag));
         pHlp->pfnPrintf(pHlp, "  GITS_CTLR          = %#RX32\n",      uCtrlReg);
         pHlp->pfnPrintf(pHlp, "    Enabled            = %RTbool\n",   RT_BF_GET(uCtrlReg, GITS_BF_CTRL_REG_CTLR_ENABLED));
@@ -584 +589 @@
 DECL_HIDDEN_CALLBACK(int) gitsR3CmdQueueProcess(PPDMDEVINS pDevIns, PGITSDEV pGitsDev, void *pvBuf, uint32_t cbBuf)
 {
+    Log4Func(("cbBuf=%RU32\n", cbBuf));
+
     /* Hold the critical section as we could be accessing the device state simultaneously with MMIO accesses. */
     GITS_CRIT_SECT_ENTER(pDevIns);
@@ -710 +717 @@
 DECL_HIDDEN_CALLBACK(int) gitsSendMsi(PVMCC pVM, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uEventId, uint32_t uTagSrc)
 {
+    Log4Func(("uBusDevFn=%#RX32 uEventId=%#RX32\n", uBusDevFn, uEventId));
     RT_NOREF(pVM, uBusDevFn, pMsi, uEventId, uTagSrc);
     return VERR_NOT_IMPLEMENTED;

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

@@ -52 +52 @@
 *********************************************************************************************************************************/
 /** GIC saved state version. */
-#define GIC_SAVED_STATE_VERSION                     8
+#define GIC_SAVED_STATE_VERSION                     9
 
 # define GIC_SYSREGRANGE(a_uFirst, a_uLast, a_szName) \
@@ -341 +341 @@
         pHlp->pfnPrintf(pHlp, "    Outer cache        = %#x\n",    RT_BF_GET(uReg, GIC_BF_REDIST_REG_PROPBASER_OUTER_CACHE));
     }
+
+    /* */
+    {
+
+    }
     /** @todo Dump LPI config and LPI pending registers. */
 }
@@ -462 +467 @@
     pHlp->pfnSSMPutMem(pSSM,  &pGicDev->bmIntrRoutingMode[0], sizeof(pGicDev->bmIntrRoutingMode));
 
+    /* LPI state. */
     /* We store the size followed by the data because we currently do not support the full LPI range. */
     pHlp->pfnSSMPutU32(pSSM,  sizeof(pGicDev->abLpiConfig));
@@ -467 +473 @@
     pHlp->pfnSSMPutU32(pSSM,  sizeof(pGicDev->bmLpiPending));
     pHlp->pfnSSMPutMem(pSSM,  &pGicDev->bmLpiPending[0],      sizeof(pGicDev->bmLpiPending));
+    pHlp->pfnSSMPutU64(pSSM,  pGicDev->uLpiConfigBaseReg.u);
+    pHlp->pfnSSMPutU64(pSSM,  pGicDev->uLpiPendingBaseReg.u);
+    pHlp->pfnSSMPutBool(pSSM, pGicDev->fEnableLpis);
 
     /** @todo GITS data. */
@@ -578 +587 @@
                                            cbData, sizeof(pGicDev->bmLpiPending));
     }
+    pHlp->pfnSSMGetU64(pSSM,  &pGicDev->uLpiConfigBaseReg.u);
+    pHlp->pfnSSMGetU64(pSSM,  &pGicDev->uLpiPendingBaseReg.u);
+    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fEnableLpis);
 
     /** @todo GITS data. */

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

@@ -170 +170 @@
 typedef GICDEV const *PCGICDEV;
 AssertCompileMemberSizeAlignment(GICDEV, Gits, 8);
+AssertCompileMemberAlignment(GICDEV, abLpiConfig, 8);
+AssertCompileMemberAlignment(GICDEV, hMmioDist, 8);
 
 /**