]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: arm64: selftests: Add SCTLR2_EL1 to get-reg-list
authorOliver Upton <oliver.upton@linux.dev>
Tue, 8 Jul 2025 17:25:31 +0000 (10:25 -0700)
committerOliver Upton <oliver.upton@linux.dev>
Tue, 8 Jul 2025 18:36:36 +0000 (11:36 -0700)
Handle SCTLR2_EL1 specially as it is only visible to userspace when
FEAT_SCTLR2 is implemented for the VM.

Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250708172532.1699409-27-oliver.upton@linux.dev
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
tools/testing/selftests/kvm/arm64/get-reg-list.c

index d01798b6b3b47fa9193fb6d65a41d6ac224d4c5f..684c52b1b8817303bf6573dfc211325f94fcbaa8 100644 (file)
@@ -52,6 +52,12 @@ static struct feature_id_reg feat_id_regs[] = {
                ARM64_SYS_REG(3, 0, 0, 7, 3),   /* ID_AA64MMFR3_EL1 */
                16,
                1
+       },
+       {
+               KVM_ARM64_SYS_REG(SYS_SCTLR2_EL1),
+               KVM_ARM64_SYS_REG(SYS_ID_AA64MMFR3_EL1),
+               ID_AA64MMFR3_EL1_SCTLRX_SHIFT,
+               ID_AA64MMFR3_EL1_SCTLRX_IMP
        }
 };
 
@@ -469,6 +475,7 @@ static __u64 base_regs[] = {
        ARM64_SYS_REG(3, 0, 1, 0, 0),   /* SCTLR_EL1 */
        ARM64_SYS_REG(3, 0, 1, 0, 1),   /* ACTLR_EL1 */
        ARM64_SYS_REG(3, 0, 1, 0, 2),   /* CPACR_EL1 */
+       KVM_ARM64_SYS_REG(SYS_SCTLR2_EL1),
        ARM64_SYS_REG(3, 0, 2, 0, 0),   /* TTBR0_EL1 */
        ARM64_SYS_REG(3, 0, 2, 0, 1),   /* TTBR1_EL1 */
        ARM64_SYS_REG(3, 0, 2, 0, 2),   /* TCR_EL1 */