Changeset 105686 in vbox for trunk/include

Timestamp:

Aug 15, 2024 12:36:59 PM (5 months ago)

Author:

vboxsync

Message:

VMMArm/CPUM: Add the additional state required to support EL2 in the guest, bugref:10747

Location:

trunk/include/VBox/vmm

Files:

• cpumctx-armv8.h (modified) (3 diffs)
• dbgf.h (modified) (2 diffs)

trunk/include/VBox/vmm/cpumctx-armv8.h

@@ -236 +236 @@
     CPUMCTXSYSREG       MDccInt;
 
+    /** @name Hypervisor (EL2) support.
+     * @{ */
+    /** The CNTHCTL_EL2 register. */
+    CPUMCTXSYSREG       CntHCtlEl2;
+    /** The CNTP_CTL_EL2 register. */
+    CPUMCTXSYSREG       CntHpCtlEl2;
+    /** The CNTP_CVAL_EL2 register. */
+    CPUMCTXSYSREG       CntHpCValEl2;
+    /** The CNTP_TVAL_EL2 register. */
+    CPUMCTXSYSREG       CntHpTValEl2;
+    /** The CNTVOFF_EL2 register. */
+    CPUMCTXSYSREG       CntVOffEl2;
+    /** The CPTR_EL2 register. */
+    CPUMCTXSYSREG       CptrEl2;
+    /** The ELR_EL2 register. */
+    CPUMCTXSYSREG       ElrEl2;
+    /** The ESR_EL2 register. */
+    CPUMCTXSYSREG       EsrEl2;
+    /** The FAR_EL2 register. */
+    CPUMCTXSYSREG       FarEl2;
+    /** The HCR_EL2 register. */
+    CPUMCTXSYSREG       HcrEl2;
+    /** The HPFAR_EL2 register. */
+    CPUMCTXSYSREG       HpFarEl2;
+    /** The MAIR_EL2 register. */
+    CPUMCTXSYSREG       MairEl2;
+    /** The MDCR_EL2 register. */
+    CPUMCTXSYSREG       MdcrEl2;
+    /** The SCTLR_EL2 register. */
+    CPUMCTXSYSREG       SctlrEl2;
+    /** The SPSR_EL2 register. */
+    CPUMCTXSYSREG       SpsrEl2;
+    /** The SP_EL2 register. */
+    CPUMCTXSYSREG       SpEl2;
+    /** The TCR_EL2 register. */
+    CPUMCTXSYSREG       TcrEl2;
+    /** The TPIDR_EL2 register. */
+    CPUMCTXSYSREG       TpidrEl2;
+    /** The TTBR0_EL2 register. */
+    CPUMCTXSYSREG       Ttbr0El2;
+    /** The TTBR1_EL2 register. */
+    CPUMCTXSYSREG       Ttbr1El2;
+    /** The VBAR_EL2 register. */
+    CPUMCTXSYSREG       VBarEl2;
+    /** The VMPIDR_EL2 register. */
+    CPUMCTXSYSREG       VMpidrEl2;
+    /** The VPIDR_EL2 register. */
+    CPUMCTXSYSREG       VPidrEl2;
+    /** The VTCR_EL2 register. */
+    CPUMCTXSYSREG       VTcrEl2;
+    /** The VTTBR_EL2 register. */
+    CPUMCTXSYSREG       VTtbrEl2;
+    /** @} */
+
     /** Floating point control register. */
     uint64_t            fpcr;
@@ -258 +312 @@
     uint64_t            CntvCValEl0;
 
-    uint64_t            au64Padding2[4];
+    uint64_t            au64Padding2[3];
 } CPUMCTX;
 
@@ -323 +377 @@
 /** PAuth key system registers are kept externally. */
 #define CPUMCTX_EXTRN_SYSREG_PAUTH_KEYS         UINT64_C(0x0000000000020000)
+/** EL2 system registers are kept externally. */
+#define CPUMCTX_EXTRN_SYSREG_EL2                UINT64_C(0x0000000000040000)
 /** Various system registers (rarely accessed) are kept externally. */
-#define CPUMCTX_EXTRN_SYSREG_MISC               UINT64_C(0x0000000000040000)
+#define CPUMCTX_EXTRN_SYSREG_MISC               UINT64_C(0x0000000000080000)
 
 /** Mask of bits the keepers can use for state tracking. */

trunk/include/VBox/vmm/dbgf.h

@@ -2156 +2156 @@
     DBGFREG_ARMV8_SP_EL1,
     DBGFREG_ARMV8_SPSR_EL1,
-    DBGFREG_ARMV8_SPSR_EL2,
-    DBGFREG_ARMV8_PSTATE = DBGFREG_ARMV8_SPSR_EL2,
+    DBGFREG_ARMV8_PSTATE,
     DBGFREG_ARMV8_SCTLR_EL1,
     DBGFREG_ARMV8_TCR_EL1,
@@ -2165 +2164 @@
     DBGFREG_ARMV8_VBAR_EL1,
 
-    DBGFREG_ARMV8_LAST = DBGFREG_ARMV8_VBAR_EL1,
+    /** EL2 system registers: */
+    DBGFREG_ARMV8_CNTHCTL_EL2,
+    DBGFREG_ARMV8_CNTHP_CTL_EL2,
+    DBGFREG_ARMV8_CNTHP_CVAL_EL2,
+    DBGFREG_ARMV8_CNTHP_TVAL_EL2,
+    DBGFREG_ARMV8_CNTVOFF_EL2,
+    DBGFREG_ARMV8_CPTR_EL2,
+    DBGFREG_ARMV8_ELR_EL2,
+    DBGFREG_ARMV8_ESR_EL2,
+    DBGFREG_ARMV8_FAR_EL2,
+    DBGFREG_ARMV8_HCR_EL2,
+    DBGFREG_ARMV8_HPFAR_EL2,
+    DBGFREG_ARMV8_MAIR_EL2,
+    DBGFREG_ARMV8_MDCR_EL2,
+    DBGFREG_ARMV8_SCTLR_EL2,
+    DBGFREG_ARMV8_SPSR_EL2,
+    DBGFREG_ARMV8_SP_EL2,
+    DBGFREG_ARMV8_TCR_EL2,
+    DBGFREG_ARMV8_TPIDR_EL2,
+    DBGFREG_ARMV8_TTBR0_EL2,
+    DBGFREG_ARMV8_TTBR1_EL2,
+    DBGFREG_ARMV8_VBAR_EL2,
+    DBGFREG_ARMV8_VMPIDR_EL2,
+    DBGFREG_ARMV8_VPIDR_EL2,
+    DBGFREG_ARMV8_VTCR_EL2,
+    DBGFREG_ARMV8_VTTBR_EL2,
+    DBGFREG_ARMV8_LAST = DBGFREG_ARMV8_VTTBR_EL2,
     /** @} */