Changeset 108871 in vbox

Timestamp:

Apr 7, 2025 1:38:57 PM (13 days ago)

Author:

vboxsync

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

168321

Message:

VMM/GIC: bugref:10877 GIC ITS command-queue, work-in-progress.

Location:

trunk

Files:

• include/VBox/gic-its.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (3 diffs)

trunk/include/VBox/gic-its.h

@@ -390 +390 @@
 
 /**
- * ITS entry type.
+ * GITS entry type.
  * In accordance to the ARM GIC spec.
  */
@@ -411 +411 @@
     {
         uint8_t         uCmdId;
-        uint8_t         au8Rsvd[3];
-        uint32_t        uDeviceId;
-
-        uint32_t        uEventId;
-        uint32_t        u32Rsvd;
-
-        uint64_t        au64Rsvd[2];
-    } clear;
+        uint8_t         auData[31];
+    } common;
 } GITSCMD;
 /** Pointer to an ITS command. */
@@ -426 +420 @@
 AssertCompileSize(GITSCMD, GITS_CMD_SIZE);
 
+/** @name GITS command IDs.
+ * @{ */
+#define GITS_CMD_ID_CLEAR                                       0x04
+#define GITS_CMD_ID_DISCARD                                     0x0f
+#define GITS_CMD_ID_INT                                         0x03
+#define GITS_CMD_ID_INV                                         0x0c
+#define GITS_CMD_ID_INVALL                                      0x0d
+#define GITS_CMD_ID_INVDB                                       0x2e
+#define GITS_CMD_ID_MAPC                                        0x09
+#define GITS_CMD_ID_MAPD                                        0x08
+#define GITS_CMD_ID_MAPI                                        0x0b
+#define GITS_CMD_ID_MAPTI                                       0x0a
+#define GITS_CMD_ID_MOVALL                                      0x0e
+#define GITS_CMD_ID_MOVI                                        0x01
+#define GITS_CMD_ID_SYNC                                        0x05
+#define GITS_CMD_ID_VINVALL                                     0x2d
+#define GITS_CMD_ID_VMAPI                                       0x2b
+#define GITS_CMD_ID_VMAPP                                       0x29
+#define GITS_CMD_ID_VMAPTI                                      0x2a
+#define GITS_CMD_ID_VMOVI                                       0x21
+#define GITS_CMD_ID_VMOVP                                       0x22
+#define GITS_CMD_ID_VSGI                                        0x23
+#define GITS_CMD_ID_VSYNC                                       0x25
+/** @} */
+
+/** @name GITS command: MAPC.
+ * @{ */
+/** MAPC DW0: Command Id. */
+#define GITS_BF_CMD_MAPC_DW0_CMD_ID_SHIFT                       0
+#define GITS_BF_CMD_MAPC_DW0_CMD_ID_MASK                        UINT64_C(0x00000000000000ff)
+/** MAPC DW0: Reserved (bits 63:8). */
+#define GITS_BF_CMD_MAPC_DW0_RSVD_63_8_SHIFT                    8
+#define GITS_BF_CMD_MAPC_DW0_RSVD_63_8_MASK                     UINT64_C(0xffffffffffffff00)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_CMD_MAPC_DW0_, UINT64_C(0), UINT64_MAX,
+                            (CMD_ID, RSVD_63_8));
+
+/** MAPC DW1: Reserved (bits 63:0). */
+#define GITS_BF_CMD_MAPC_DW1_RSVD_63_0_MASK                     UINT64_MAX
+
+/** MAPC DW2: IC ID - The interrupt collection ID. */
+#define GITS_BF_CMD_MAPC_DW2_IC_ID_SHIFT                        0
+#define GITS_BF_CMD_MAPC_DW2_IC_ID_MASK                         UINT64_C(0x000000000000ffff)
+/** MAPC DW2: RDBase - The target redistributor base address or PE number. */
+#define GITS_BF_CMD_MAPC_DW2_RDBASE_SHIFT                       16
+#define GITS_BF_CMD_MAPC_DW2_RDBASE_MASK                        UINT64_C(0x0007ffffffff0000)
+/** MAPC DW2: Reserved (bits 62:51). */
+#define GITS_BF_CMD_MAPC_DW2_RSVD_62_51_SHIFT                   51
+#define GITS_BF_CMD_MAPC_DW2_RSVD_62_51_MASK                    UINT64_C(0x7ff8000000000000)
+/** MAPC DW2: Valid bit. */
+#define GITS_BF_CMD_MAPC_DW2_VALID_SHIFT                        63
+#define GITS_BF_CMD_MAPC_DW2_VALID_MASK                         UINT64_C(0x8000000000000000)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_CMD_MAPC_DW2_, UINT64_C(0), UINT64_MAX,
+                            (IC_ID, RDBASE, RSVD_62_51, VALID));
+/** @} */
+
 #endif /* !VBOX_INCLUDED_gic_its_h */
 

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

@@ -136 +136 @@
 }
 
-static void gitsCmdQueueSetError(PGITSDEV pGitsDev, GITSDIAG enmError, bool fStallQueue)
-{
+
+static const char * gitsGetCommandName(uint8_t uCmdId)
+{
+    switch (uCmdId)
+    {
+        case GITS_CMD_ID_CLEAR:     return "CLEAR";
+        case GITS_CMD_ID_DISCARD:   return "DISCARD";
+        case GITS_CMD_ID_INT:       return "INT";
+        case GITS_CMD_ID_INV:       return "INV";
+        case GITS_CMD_ID_INVALL:    return "INVALL";
+        case GITS_CMD_ID_INVDB:     return "INVDB";
+        case GITS_CMD_ID_MAPC:      return "MAPC";
+        case GITS_CMD_ID_MAPD:      return "MAPD";
+        case GITS_CMD_ID_MAPI:      return "MAPI";
+        case GITS_CMD_ID_MAPTI:     return "MAPTI";
+        case GITS_CMD_ID_MOVALL:    return "MOVALL";
+        case GITS_CMD_ID_MOVI:      return "MOVI";
+        case GITS_CMD_ID_SYNC:      return "SYNC";
+        case GITS_CMD_ID_VINVALL:   return "VINVALL";
+        case GITS_CMD_ID_VMAPI:     return "VMAPI";
+        case GITS_CMD_ID_VMAPP:     return "VMAPP";
+        case GITS_CMD_ID_VMAPTI:    return "VMAPTI";
+        case GITS_CMD_ID_VMOVI:     return "VMOVI";
+        case GITS_CMD_ID_VMOVP:     return "VMOVP";
+        case GITS_CMD_ID_VSGI:      return "VSGI";
+        case GITS_CMD_ID_VSYNC:     return "VSYNC";
+        default:
+            return "<UNKNOWN>";
+    }
+}
+
+
+static void gitsCmdQueueSetError(PPDMDEVINS pDevIns, PGITSDEV pGitsDev, GITSDIAG enmError, bool fStallQueue)
+{
+    Assert(GITS_CRIT_SECT_IS_OWNER(pDevIns));
+    NOREF(pDevIns);
+
     /* Record the error and stall the queue. */
     pGitsDev->uCmdQueueError = enmError;
@@ -484 +519 @@
              * Read all the commands from guest memory into our command queue buffer.
              */
-            RTGCPHYS const GCPhysCmds = pGitsDev->uCmdBaseReg.u & GITS_BF_CTRL_REG_CBASER_PHYS_ADDR_MASK;
-
-            /* Temporarily leave the critical section while reading (a potentially large number of) commands from guest memory. */
-            GITS_CRIT_SECT_LEAVE(pDevIns);
-
             int      rc;
             uint32_t cbCmds;
+            RTGCPHYS const GCPhysCmds = pGitsDev->uCmdBaseReg.u & GITS_BF_CTRL_REG_CBASER_PHYS_ADDR_MASK;
+
+            /* Leave the critical section while reading (a potentially large number of) commands from guest memory. */
+            GITS_CRIT_SECT_LEAVE(pDevIns);
+
             if (offWrite > offRead)
             {
@@ -507 +542 @@
                 if (   RT_SUCCESS(rc)
                     && cbWrapped > 0)
-                    rc = PDMDevHlpPhysReadMeta(pDevIns, GCPhysCmds + cbForward,
-                                               (void *)((uintptr_t)pvBuf + cbForward), cbWrapped);
+                {
+                    rc = PDMDevHlpPhysReadMeta(pDevIns, GCPhysCmds + cbForward, (void *)((uintptr_t)pvBuf + cbForward),
+                                               cbWrapped);
+                }
                 cbCmds = cbForward + cbWrapped;
             }
 
-            /* Re-acquire the critical section as we now need to modify device state. */
+            /* Indicate to the guest we've fetched all commands. */
             GITS_CRIT_SECT_ENTER(pDevIns);
+            pGitsDev->uCmdReadReg = RT_BF_SET(pGitsDev->uCmdReadReg, GITS_BF_CTRL_REG_CREADR_OFFSET, offWrite);
 
             /*
-             * Process the commands in the queue.
+             * Process the commands in the buffer.
              */
             if (RT_SUCCESS(rc))
             {
+                /* Don't hold the lock while processing commands. */
+                GITS_CRIT_SECT_LEAVE(pDevIns);
+
                 uint32_t const cCmds = cbCmds / GITS_CMD_SIZE;
                 for (uint32_t idxCmd = 0; idxCmd < cCmds; idxCmd++)
                 {
-                    PCGITSCMD pCmd = (PCGITSCMD)((uintptr_t)pvBuf + (idxCmd * sizeof(GITSCMD)));
-                    AssertReleaseMsgFailed(("Cmd=%#x\n", pCmd->clear.uCmdId));
+                    PCGITSCMD pCmd = (PCGITSCMD)((uintptr_t)pvBuf + (idxCmd * GITS_CMD_SIZE));
+                    uint8_t const uCmdId = pCmd->common.uCmdId;
+                    switch (uCmdId)
+                    {
+                        case GITS_CMD_ID_MAPC:
+                        {
+                            Assert(!RT_BF_GET(pGitsDev->uTypeReg.u, GITS_BF_CTRL_REG_TYPER_PTA)); /* GITS_TYPER is read-only */
+                            /** @todo Implementing me. Figure out interrupt collection, HCC etc. */
+                            //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);
+                            break;
+                        }
+
+                        default:
+                            AssertReleaseMsgFailed(("Cmd=%#x (%s)\n", uCmdId, gitsGetCommandName(uCmdId)));
+                            break;
+                    }
                 }
-
-                GITS_CRIT_SECT_LEAVE(pDevIns);
                 return VINF_SUCCESS;
             }
 
             /* Failed to read command queue from the physical address specified by the guest, stall queue and retry later. */
-            gitsCmdQueueSetError(pGitsDev, kGitsDiag_CmdQueue_PhysAddr_Invalid, true /* fStall */);
+            gitsCmdQueueSetError(pDevIns, pGitsDev, kGitsDiag_CmdQueue_PhysAddr_Invalid, true /* fStall */);
+            GITS_CRIT_SECT_LEAVE(pDevIns);
             return VINF_TRY_AGAIN;
         }