Changeset 108912 in vbox

Timestamp:

Apr 9, 2025 10:00:06 AM (11 days ago)

Author:

vboxsync

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

168380

Message:

VMM/GIC: bugref:10877 GIC ITS - The interrupt collection table internal to the ITS, its size is restricted to 256 entries.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GITSAll.cpp (modified) (3 diffs)
• include/GITSInternal.h (modified) (2 diffs)

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

@@ -385 +385 @@
     Log4Func(("\n"));
 
-    pGitsDev->uCtrlReg   = RT_BF_MAKE(GITS_BF_CTRL_REG_CTLR_QUIESCENT, 1);
+    pGitsDev->uCtrlReg   = RT_BF_MAKE(GITS_BF_CTRL_REG_CTLR_QUIESCENT,  1);
     pGitsDev->uTypeReg.u = RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_PHYSICAL,  1)     /* Physical LPIs supported. */
                        /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_VIRTUAL,   0) */  /* Virtual LPIs not supported. */
@@ -395 +395 @@
                        /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_PTA,       0) */  /* Target is VCPU ID not address. */
                          | RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_HCC,       255)   /* Collection count. */
-                       /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_CID_BITS,  0) */  /* CIL specifies collection ID size. */
-                       /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_CIL,       0) */  /* 16-bit collection IDs. */
+                       /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_CID_BITS,  0) */  /* 16-bit collection IDs. */
+                         | RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_CIL,       1)     /* Collection ID limit enforced. */
                        /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_VMOVP,     0) */  /* VMOVP not supported. */
                        /*| RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_MPAM,      0) */  /* MPAM no supported. */
@@ -407 +407 @@
                          | RT_BF_MAKE(GITS_BF_CTRL_REG_TYPER_INV,       1);    /* ITS caches invalidated when clearing
                                                                                   GITS_CTLR.Enabled and GITS_BASER<n>.Valid. */
+    Assert(RT_ELEMENTS(pGitsDev->auCtes) >= RT_BF_GET(pGitsDev->uTypeReg.u, GITS_BF_CTRL_REG_TYPER_HCC));
     RT_ZERO(pGitsDev->aItsTableRegs);
     //pGitsDev->aItsTableRegs[0].u = RT_BF_MAKE(GITS_BF_CTRL_REG_BASER_ENTRY_SIZE, )

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

@@ -66 +66 @@
  * @{ */
 #define GITS_BF_ITE_ICID_SHIFT                      0
-#define GITS_BF_ITE_ICID_MASK                       UINT64_C(0x000000000000ffff)
-#define GITS_BF_ITE_INTID_SHIFT                     16
-#define GITS_BF_ITE_INTID_MASK                      UINT64_C(0x00000000ffff0000)
-#define GITS_BF_ITE_RSVD_62_32_SHIFT                32
-#define GITS_BF_ITE_RSVD_62_32_MASK                 UINT64_C(0x7fffffff00000000)
-#define GITS_BF_ITE_VALID_SHIFT                     63
-#define GITS_BF_ITE_VALID_MASK                      UINT64_C(0x8000000000000000)
-RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_ITE_, UINT64_C(0), UINT64_MAX,
-                            (ICID, INTID, RSVD_62_32, VALID));
+#define GITS_BF_ITE_ICID_MASK                       UINT32_C(0x000000ff)
+#define GITS_BF_ITE_INTID_SHIFT                     8
+#define GITS_BF_ITE_INTID_MASK                      UINT32_C(0x00ffff00)
+#define GITS_BF_ITE_RSVD_30_24_SHIFT                24
+#define GITS_BF_ITE_RSVD_30_24_MASK                 UINT32_C(0x7f000000)
+#define GITS_BF_ITE_VALID_SHIFT                     31
+#define GITS_BF_ITE_VALID_MASK                      UINT32_C(0x80000000)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_ITE_, UINT32_C(0), UINT32_MAX,
+                            (ICID, INTID, RSVD_30_24, VALID));
 /** GITS ITE: Size of the ITE in bytes. */
-#define GITS_ITE_SIZE                               8
+#define GITS_ITE_SIZE                               4
 /** @} */
 
@@ -160 +160 @@
      */
     /** The collection table. */
-    uint32_t                auCtes[2048];
+    uint32_t                auCtes[256];
     /** @} */