Changeset 108751 in vbox for trunk/include

Timestamp:

Mar 26, 2025 10:33:33 AM (4 weeks ago)

Author:

vboxsync

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

168176

Message:

VMM/GIC: bugref:10877 GITS PIDR2 register reads and related nits.

Location:

trunk/include/VBox

Files:

• gic-its.h (modified) (1 diff)
• gic.h (modified) (3 diffs)

trunk/include/VBox/gic-its.h

@@ -204 +204 @@
 #define GITS_CTRL_REG_BASER_RANGE_SIZE                          (GITS_CTRL_REG_BASER_OFF_LAST + sizeof(uint64_t) - GITS_CTRL_REG_BASER_OFF_FIRST)
 
+/** GITS_PIDR2: ITS Peripheral ID2 register - RO. */
+#define GITS_CTRL_REG_PIDR2_OFF                                 0xffe8
+/** GITS_PIDR2: JEDEC - JEP code. */
+#define GITS_BF_CTRL_REG_PIDR2_JEDEC_SHIFT                      0
+#define GITS_BF_CTRL_REG_PIDR2_JEDEC_MASK                       UINT32_C(0x00000007)
+/** GITS_PIDR2: DES_1 - JEP106 identification code (bits 6:4).  */
+#define GITS_BF_CTRL_REG_PIDR2_DES_1_SHIFT                      3
+#define GITS_BF_CTRL_REG_PIDR2_DES_1_MASK                       UINT32_C(0x00000008)
+/** GITS_PIDR2: Architecture revision . */
+#define GITS_BF_CTRL_REG_PIDR2_ARCHREV_SHIFT                    4
+#define GITS_BF_CTRL_REG_PIDR2_ARCHREV_MASK                     UINT32_C(0x000000f0)
+/** GITS_PIDR2: Reserved (bits 31:8). */
+#define GITS_BF_CTRL_REG_PIDR2_RSVD_31_8_SHIFT                  8
+#define GITS_BF_CTRL_REG_PIDR2_RSVD_31_8_MASK                   UINT32_C(0xffffff00)
+RT_BF_ASSERT_COMPILE_CHECKS(GITS_BF_CTRL_REG_PIDR2_, UINT32_C(0), UINT32_MAX,
+                            (JEDEC, DES_1, ARCHREV, RSVD_31_8));
+
+/** GITS_PIDR2: GICv1 architecture revision. */
+#define GITS_CTRL_REG_PIDR2_ARCHREV_GICV1                       0x1
+/** GITS_PIDR2: GICv2 architecture revision. */
+#define GITS_CTRL_REG_PIDR2_ARCHREV_GICV2                       0x2
+/** GITS_PIDR2: GICv3 architecture revision. */
+#define GITS_CTRL_REG_PIDR2_ARCHREV_GICV3                       0x3
+/** GITS_PIDR2: GICv4 architecture revision. */
+#define GITS_CTRL_REG_PIDR2_ARCHREV_GICV4                       0x4
+
+/** GITS_TRANSLATER register. */
 #define GITS_TRANSLATION_REG_TRANSLATER                         0x0040
 

trunk/include/VBox/gic.h

@@ -389 +389 @@
 #define GIC_DIST_REG_PIDR2_OFF                          0xffe8
 /** Bit 4 - 7 - GIC architecture revision */
-# define GIC_DIST_REG_PIDR2_ARCH_REV                    (  RT_BIT_32(4) | RT_BIT_32(5) | RT_BIT_32(6) \
-                                                         | RT_BIT_32(7))
-# define GIC_DIST_REG_PIDR2_ARCH_REV_SET(a_ArchRev)     (((a_ArchRev) << 4) & GIC_DIST_REG_PIDR2_ARCH_REV)
+# define GIC_DIST_REG_PIDR2_ARCHREV                     (RT_BIT_32(4) | RT_BIT_32(5) | RT_BIT_32(6) | RT_BIT_32(7))
+# define GIC_DIST_REG_PIDR2_ARCHREV_SET(a_ArchRev)      (((a_ArchRev) << 4) & GIC_DIST_REG_PIDR2_ARCHREV)
 /** GICv1 architecture revision. */
-#  define GIC_DIST_REG_PIDR2_ARCH_REV_GICV1             0x1
+#  define GIC_DIST_REG_PIDR2_ARCHREV_GICV1              0x1
 /** GICv2 architecture revision. */
-#  define GIC_DIST_REG_PIDR2_ARCH_REV_GICV2             0x2
+#  define GIC_DIST_REG_PIDR2_ARCHREV_GICV2              0x2
 /** GICv3 architecture revision. */
-#  define GIC_DIST_REG_PIDR2_ARCH_REV_GICV3             0x3
+#  define GIC_DIST_REG_PIDR2_ARCHREV_GICV3              0x3
 /** GICv4 architecture revision. */
-#  define GIC_DIST_REG_PIDR2_ARCH_REV_GICV4             0x4
+#  define GIC_DIST_REG_PIDR2_ARCHREV_GICV4              0x4
 /** @} */
 
@@ -527 +526 @@
 #define GIC_REDIST_REG_PIDR2_OFF                        0xffe8
 /** Bit 4 - 7 - GIC architecture revision */
-# define GIC_REDIST_REG_PIDR2_ARCH_REV                  (  RT_BIT_32(4) | RT_BIT_32(5) | RT_BIT_32(6) \
-                                                         | RT_BIT_32(7))
-# define GIC_REDIST_REG_PIDR2_ARCH_REV_SET(a_ArchRev)   (((a_ArchRev) << 4) & GIC_DIST_REG_PIDR2_ARCH_REV)
+# define GIC_REDIST_REG_PIDR2_ARCHREV                   (RT_BIT_32(4) | RT_BIT_32(5) | RT_BIT_32(6) | RT_BIT_32(7))
+# define GIC_REDIST_REG_PIDR2_ARCHREV_SET(a_ArchRev)    (((a_ArchRev) << 4) & GIC_REDIST_REG_PIDR2_ARCHREV)
 /** GICv1 architecture revision. */
-#  define GIC_REDIST_REG_PIDR2_ARCH_REV_GICV1           0x1
+#  define GIC_REDIST_REG_PIDR2_ARCHREV_GICV1            0x1
 /** GICv2 architecture revision. */
-#  define GIC_REDIST_REG_PIDR2_ARCH_REV_GICV2           0x2
+#  define GIC_REDIST_REG_PIDR2_ARCHREV_GICV2            0x2
 /** GICv3 architecture revision. */
-#  define GIC_REDIST_REG_PIDR2_ARCH_REV_GICV3           0x3
+#  define GIC_REDIST_REG_PIDR2_ARCHREV_GICV3            0x3
 /** GICv4 architecture revision. */
-#  define GIC_REDIST_REG_PIDR2_ARCH_REV_GICV4           0x4
+#  define GIC_REDIST_REG_PIDR2_ARCHREV_GICV4            0x4
 /** @} */
 
@@ -641 +639 @@
 
 
+/** @name JEDEC codes for ARM.
+ * @{ */
+/** JEP106 identification code. */
+#define GIC_JEDEC_JEP106_IDENTIFICATION_CODE            0x3b
+/** JEP106 continuation code. */
+#define GIC_JEDEC_JEP106_CONTINUATION_CODE              0x4
+
+/** DES_0 - JEP106 identification code bits (3:0). */
+#define GIC_JEDEC_JEP10_DES_0(a_JepIdCode)              ((a_JepIdCode) & 0xf)
+/** DES_1 - JEP106 identification code bits (6:4). */
+#define GIC_JEDEC_JEP10_DES_1(a_JepIdCode)              (((a_JepIdCode) >> 4) & 0x70)
+/** @} */
+
 #endif /* !VBOX_INCLUDED_gic_h */