KVM: arm64: nv: Honor absence of FEAT_PAN2

If our guest has been configured without PAN2, make sure that
AT S1E1{R,W}P will generate an UNDEF.

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index c90324060436b272fd0f7dde8e023a7911edcc7b..e7e5e0df119e9ea1d7ca8764f8090336f301b4b8 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -4600,6 +4600,10 @@ void kvm_calculate_traps(struct kvm_vcpu *vcpu)
                                                HFGITR_EL2_TLBIRVAAE1OS |
                                                HFGITR_EL2_TLBIRVAE1OS);
 
+       if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, PAN, PAN2))
+               kvm->arch.fgu[HFGITR_GROUP] |= (HFGITR_EL2_ATS1E1RP |
+                                               HFGITR_EL2_ATS1E1WP);
+
        if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1PIE, IMP))
                kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 |
                                                HFGxTR_EL2_nPIR_EL1);