Changeset 108878 in vbox

Timestamp:

Apr 8, 2025 8:00:56 AM (12 days ago)

Author:

vboxsync

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

168329

Message:

VMM/GIC: bugref:10877 Command-queue, read from start to CREADR offset (not CWRITER offset) when commands have wrapped around, work-in-progress.

File:

• trunk/src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (2 diffs)

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

@@ -538 +538 @@
                 /* The write offset has wrapped around, read till end of buffer followed by wrapped-around data. */
                 uint32_t const cbForward = cbCmdQueue - offRead;
-                uint32_t const cbWrapped = offWrite;
+                uint32_t const cbWrapped = offRead;
                 Assert(cbForward + cbWrapped <= cbBuf);
                 rc  = PDMDevHlpPhysReadMeta(pDevIns, GCPhysCmds, pvBuf, cbForward);
@@ -571 +571 @@
                         case GITS_CMD_ID_MAPC:
                         {
-                            Assert(!RT_BF_GET(pGitsDev->uTypeReg.u, GITS_BF_CTRL_REG_TYPER_PTA)); /* GITS_TYPER is read-only */
                             uint64_t const uDw2 = pCmd->au64[2].u;
                             bool const     fValid            = RT_BF_GET(uDw2, GITS_BF_CMD_MAPC_DW2_VALID);
                             uint32_t const uTargetCpuId      = RT_BF_GET(uDw2, GITS_BF_CMD_MAPC_DW2_RDBASE);
                             uint16_t const uIntrCollectionId = RT_BF_GET(uDw2, GITS_BF_CMD_MAPC_DW2_IC_ID);
-
-                            AssertRelease(uIntrCollectionId < RT_ELEMENTS(pGitsDev->auCt));
+                            AssertRelease(uIntrCollectionId < RT_ELEMENTS(pGitsDev->auCt)); /** @todo later figure ideal/correct CT size. */
+
+                            GITS_CRIT_SECT_ENTER(pDevIns);
+                            Assert(!RT_BF_GET(pGitsDev->uTypeReg.u, GITS_BF_CTRL_REG_TYPER_PTA));
                             pGitsDev->auCt[uIntrCollectionId].fValid      = fValid;
                             pGitsDev->auCt[uIntrCollectionId].idTargetCpu = uTargetCpuId;
+                            GITS_CRIT_SECT_LEAVE(pDevIns);
                             break;
                         }