Changeset 108877 in vbox

Timestamp:

Apr 8, 2025 7:42:07 AM (4 weeks ago)

Author:

vboxsync

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

168328

Message:

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

Location:

trunk

Files:

• include/VBox/gic.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (5 diffs)
• src/VBox/VMM/include/GITSInternal.h (modified) (2 diffs)

trunk/include/VBox/gic.h ¶

@@ -499 +499 @@
 # define GIC_REDIST_REG_TYPER_VSGI_BIT                  26
 /** Bit 27 - 31 - Indicates the maximum PPI INTID that a GIC implementation can support. */
-# define GIC_REDIST_REG_TYPER_PPI_NUM                  (  RT_BIT_32(27) | RT_BIT_32(28) | RT_BIT_32(29) \
-                                                        | RT_BIT_32(30) | RT_BIT_32(31))
-# define GIC_REDIST_REG_TYPER_PPI_NUM_SET(a_PpiNum)    (((a_PpiNum) << 27) & GIC_REDIST_REG_TYPER_PPI_NUM)
+# define GIC_REDIST_REG_TYPER_PPI_NUM                   (  RT_BIT_32(27) | RT_BIT_32(28) | RT_BIT_32(29) \
+                                                         | RT_BIT_32(30) | RT_BIT_32(31))
+# define GIC_REDIST_REG_TYPER_PPI_NUM_SET(a_PpiNum)     (((a_PpiNum) << 27) & GIC_REDIST_REG_TYPER_PPI_NUM)
 /** Maximum PPI INTID is 31. */
-#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_31          0
+#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_31           0
 /** Maximum PPI INTID is 1087. */
-#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1087        1
+#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1087         1
 /** Maximum PPI INTID is 1119. */
-#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1119        2
+#  define GIC_REDIST_REG_TYPER_PPI_NUM_MAX_1119         2
+# define GIC_REDIST_REG_TYPER_CPU_NUMBER_MASK           (GIC_REDIST_REG_TYPER_CPU_NUMBER >> 8)
 
 /** Redistributor Type Register (the affinity value of the 64-bit register) - RO. */
-#define GIC_REDIST_REG_TYPER_AFFINITY_OFF              0x000c
+#define GIC_REDIST_REG_TYPER_AFFINITY_OFF               0x000c
 /** Bit 0 - 31 - The identity of the PE associated with this Redistributor. */
-# define GIC_REDIST_REG_TYPER_AFFINITY_VALUE           UINT32_C(0xffffffff)
+# define GIC_REDIST_REG_TYPER_AFFINITY_VALUE            UINT32_C(0xffffffff)
 # define GIC_REDIST_REG_TYPER_AFFINITY_VALUE_SET(a_Aff) ((a_Aff) & GIC_REDIST_REG_TYPER_AFFINITY_VALUE)
 

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

@@ -65 +65 @@
 #define GITS_CRIT_SECT_IS_OWNER(a_pDevIns)      PDMDevHlpCritSectIsOwner((a_pDevIns), (a_pDevIns)->CTX_SUFF(pCritSectRo))
 
+/** GITS diagnostic enum description expansion.
+ * The below construct ensures typos in the input to this macro are caught
+ * during compile time. */
+#define GITSDIAG_DESC(a_Name)        RT_CONCAT(kGitsDiag_, a_Name) < kGitsDiag_End ? RT_STR(a_Name) : "Ignored"
+
 
 /*********************************************************************************************************************************
@@ -81 +86 @@
 AssertCompileSize(GITSITE, 8);
 
-/** GITS diagnostic enum description expansion.
- * The below construct ensures typos in the input to this macro are caught
- * during compile time. */
-#define GITSDIAG_DESC(a_Name)        RT_CONCAT(kGitsDiag_, a_Name) < kGitsDiag_End ? RT_STR(a_Name) : "Ignored"
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** GITS diagnostics description for members in GITSDIAG. */
 static const char *const g_apszGitsDiagDesc[] =
@@ -94 +99 @@
 AssertCompile(RT_ELEMENTS(g_apszGitsDiagDesc) == kGitsDiag_End);
 #undef GITSDIAG_DESC
-
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
 
 
@@ -420 +420 @@
     pGitsDev->uCmdReadReg        = 0;
     pGitsDev->uCmdWriteReg       = 0;
+    RT_ZERO(pGitsDev->auCt);
 }
 
@@ -571 +572 @@
                         {
                             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);
+                            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));
+                            pGitsDev->auCt[uIntrCollectionId].fValid      = fValid;
+                            pGitsDev->auCt[uIntrCollectionId].idTargetCpu = uTargetCpuId;
+                            break;
+                        }
+
+                        case GITS_CMD_ID_SYNC:
+                        {
+                            /* Nothing to do since all previous commands have committed their changes to device state. */
+                            break;
+                        }
+
+                        case GITS_CMD_ID_INVALL:
+                        {
+                            /* Nothing to do as we currently do not cache interrupt mappings. */
                             break;
                         }

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

@@ -96 +96 @@
 #endif
 
+/**
+ * GITS Collection Table Entry (CTE).
+ */
+typedef struct GITSCTE
+{
+    /** Whether this entry is valid. */
+    bool        fValid;
+    /** Alignment. */
+    bool        afPadding;
+    /** Target CPU ID (size based on GICR_TYPER.Processor_Number). */
+    uint16_t    idTargetCpu;
+} GITSCTE;
+/** Pointer to a GITS Collection Table Entry (CTE). */
+typedef GITSCTE *PGITSCTE;
+/** Pointer to a const GITS Collection Table Entry (CTE). */
+typedef GITSCTE const *PCGITSCTE;
+AssertCompileSize(GITSCTE, 4);
 
 /**
@@ -136 +153 @@
     /** @} */
 
+    /** @name Tables.
+     * @{
+     */
+    /** The collection table. */
+    GITSCTE                 auCt[2048];
+    /** @} */
+
     /** @name Configurables.
      * @{ */