KVM: arm64: Add kvm_has_s1poe() helper

Just like we have kvm_has_s1pie(), add its S1POE counterpart,
making the code slightly more readable.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241023145345.1613824-31-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 063463d056444ba05c3f0520d8d627a66d322629..9269d893f85bb8f97e4692ddf79947c95ba69bc1 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -1525,4 +1525,7 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val);
 #define kvm_has_s1pie(k)                               \
        (kvm_has_feat((k), ID_AA64MMFR3_EL1, S1PIE, IMP))
 
+#define kvm_has_s1poe(k)                               \
+       (kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))
+
 #endif /* __ARM64_KVM_HOST_H__ */

diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
index a306ea70502c429b50d45ad0684c00015108c884..a651c43ad679fcc5a13ab7a619e252d96fd46281 100644 (file)
--- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
+++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
@@ -80,7 +80,7 @@ static inline bool ctxt_has_s1poe(struct kvm_cpu_context *ctxt)
                return false;
 
        vcpu = ctxt_to_vcpu(ctxt);
-       return kvm_has_feat(kern_hyp_va(vcpu->kvm), ID_AA64MMFR3_EL1, S1POE, IMP);
+       return kvm_has_s1poe(kern_hyp_va(vcpu->kvm));
 }
 
 static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 9838b92dde5f1fdc62f8fb2767039acb86d7c78f..be88a36da071e7bbc427c6c6f9827b789076eb1a 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -1107,7 +1107,7 @@ int kvm_init_nv_sysregs(struct kvm *kvm)
                res0 |= HFGxTR_EL2_nRCWMASK_EL1;
        if (!kvm_has_s1pie(kvm))
                res0 |= (HFGxTR_EL2_nPIRE0_EL1 | HFGxTR_EL2_nPIR_EL1);
-       if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1POE, IMP))
+       if (!kvm_has_s1poe(kvm))
                res0 |= (HFGxTR_EL2_nPOR_EL0 | HFGxTR_EL2_nPOR_EL1);
        if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S2POE, IMP))
                res0 |= HFGxTR_EL2_nS2POR_EL1;
@@ -1217,7 +1217,7 @@ int kvm_init_nv_sysregs(struct kvm *kvm)
                res0 |= TCR2_EL2_PTTWI | TCR2_EL2_PnCH;
        if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, AIE, IMP))
                res0 |= TCR2_EL2_AIE;
-       if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1POE, IMP))
+       if (!kvm_has_s1poe(kvm))
                res0 |= TCR2_EL2_POE | TCR2_EL2_E0POE;
        if (!kvm_has_s1pie(kvm))
                res0 |= TCR2_EL2_PIE;

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index e0fbe71d589096f5fe976bdac00067925236cdd3..d46663f27fbaa62c6df97ffed91a36d5299c8136 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -2323,7 +2323,7 @@ static bool access_zcr_el2(struct kvm_vcpu *vcpu,
 static unsigned int s1poe_visibility(const struct kvm_vcpu *vcpu,
                                     const struct sys_reg_desc *rd)
 {
-       if (kvm_has_feat(vcpu->kvm, ID_AA64MMFR3_EL1, S1POE, IMP))
+       if (kvm_has_s1poe(vcpu->kvm))
                return 0;
 
        return REG_HIDDEN;
@@ -4862,7 +4862,7 @@ void kvm_calculate_traps(struct kvm_vcpu *vcpu)
                kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 |
                                                HFGxTR_EL2_nPIR_EL1);
 
-       if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1POE, IMP))
+       if (!kvm_has_s1poe(kvm))
                kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPOR_EL1 |
                                                HFGxTR_EL2_nPOR_EL0);