From: Suzuki K Poulose Given we have different types of VMs supported, check the support for SVE for the given instance of the VM to accurately report the status. Signed-off-by: Suzuki K Poulose Signed-off-by: Steven Price Reviewed-by: Gavin Shan Reviewed-by: Joey Gouly --- Changes since v10: * RME->RMI renaming. * Adapt to move CAP check to kvm_realm_ext_allowed(). --- arch/arm64/include/asm/kvm_rmi.h | 2 ++ arch/arm64/kvm/arm.c | 2 ++ arch/arm64/kvm/rmi.c | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/include/asm/kvm_rmi.h b/arch/arm64/include/asm/kvm_rmi.h index 0fb685004d5c..13933f0e555d 100644 --- a/arch/arm64/include/asm/kvm_rmi.h +++ b/arch/arm64/include/asm/kvm_rmi.h @@ -98,6 +98,8 @@ struct realm_rec { void kvm_init_rmi(void); u32 kvm_rmm_ipa_limit(void); +bool kvm_rmi_supports_sve(void); + int kvm_init_realm(struct kvm *kvm); int kvm_activate_realm(struct kvm *kvm); void kvm_destroy_realm(struct kvm *kvm); diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 96e536d2dda8..3242108be7c5 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -151,6 +151,8 @@ static bool kvm_realm_ext_allowed(long ext) case KVM_CAP_ARM_RMI: case KVM_CAP_SYNC_MMU: return true; + case KVM_CAP_ARM_SVE: + return kvm_rmi_supports_sve(); } return false; } diff --git a/arch/arm64/kvm/rmi.c b/arch/arm64/kvm/rmi.c index 904df7c7245d..0d46768022df 100644 --- a/arch/arm64/kvm/rmi.c +++ b/arch/arm64/kvm/rmi.c @@ -26,6 +26,11 @@ static bool rmi_has_feature(int reg, unsigned long feature) return !!u64_get_bits(rmi_feat_reg(reg), feature); } +bool kvm_rmi_supports_sve(void) +{ + return rmi_has_feature(0, RMI_FEATURE_REGISTER_0_SVE); +} + u32 kvm_rmm_ipa_limit(void) { return u64_get_bits(rmi_feat_reg(0), RMI_FEATURE_REGISTER_0_S2SZ); -- 2.43.0