KVM: arm64: Add PIR{,E0}_EL2 to the sysreg arrays

Add the FEAT_S1PIE EL2 registers to the per-vcpu sysreg register
array.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241023145345.1613824-15-maz@kernel.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index b41de132fa4e7166a08645aa7d882868c9af2797..553fb07f215328245fbd319b54e4a7689f94c50c 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -478,6 +478,8 @@ enum vcpu_sysreg {
        TTBR0_EL2,      /* Translation Table Base Register 0 (EL2) */
        TTBR1_EL2,      /* Translation Table Base Register 1 (EL2) */
        TCR_EL2,        /* Translation Control Register (EL2) */
+       PIRE0_EL2,      /* Permission Indirection Register 0 (EL2) */
+       PIR_EL2,        /* Permission Indirection Register 1 (EL2) */
        SPSR_EL2,       /* EL2 saved program status register */
        ELR_EL2,        /* EL2 exception link register */
        AFSR0_EL2,      /* Auxiliary Fault Status Register 0 (EL2) */

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index a435b78606c017cd718105da4dcff434017f55dd..9cbcd69d45fc25cf02636cc3f443a45c6303ba44 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -135,6 +135,8 @@ static bool get_el2_to_el1_mapping(unsigned int reg,
                MAPPED_EL2_SYSREG(FAR_EL2,     FAR_EL1,     NULL             );
                MAPPED_EL2_SYSREG(MAIR_EL2,    MAIR_EL1,    NULL             );
                MAPPED_EL2_SYSREG(TCR2_EL2,    TCR2_EL1,    NULL             );
+               MAPPED_EL2_SYSREG(PIR_EL2,     PIR_EL1,     NULL             );
+               MAPPED_EL2_SYSREG(PIRE0_EL2,   PIRE0_EL1,   NULL             );
                MAPPED_EL2_SYSREG(AMAIR_EL2,   AMAIR_EL1,   NULL             );
                MAPPED_EL2_SYSREG(ELR_EL2,     ELR_EL1,     NULL             );
                MAPPED_EL2_SYSREG(SPSR_EL2,    SPSR_EL1,    NULL             );