KVM: arm64: Allow the use of SVE+NV

Allow SVE and NV to mix now that everything is in place to handle it
correctly.

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

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 59716789fe0f38186cd1700f92757b005f48d1cb..bfad0a7f5d12d5b1eaff3823695b3916df0712c7 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1419,11 +1419,6 @@ static int kvm_vcpu_init_check_features(struct kvm_vcpu *vcpu,
            test_bit(KVM_ARM_VCPU_PTRAUTH_GENERIC, &features))
                return -EINVAL;
 
-       /* Disallow NV+SVE for the time being */
-       if (test_bit(KVM_ARM_VCPU_HAS_EL2, &features) &&
-           test_bit(KVM_ARM_VCPU_SVE, &features))
-               return -EINVAL;
-
        if (!test_bit(KVM_ARM_VCPU_EL1_32BIT, &features))
                return 0;
 

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index bae8536cbf003e9b949db4df115f0a7815e55554..2b9fcbb0fe6c50a3a0bad5fbcefdb76a50f63ec5 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -41,13 +41,12 @@ static u64 limit_nv_id_reg(u32 id, u64 val)
                break;
 
        case SYS_ID_AA64PFR0_EL1:
-               /* No AMU, MPAM, S-EL2, RAS or SVE */
+               /* No AMU, MPAM, S-EL2, or RAS */
                val &= ~(GENMASK_ULL(55, 52)    |
                         NV_FTR(PFR0, AMU)      |
                         NV_FTR(PFR0, MPAM)     |
                         NV_FTR(PFR0, SEL2)     |
                         NV_FTR(PFR0, RAS)      |
-                        NV_FTR(PFR0, SVE)      |
                         NV_FTR(PFR0, EL3)      |
                         NV_FTR(PFR0, EL2)      |
                         NV_FTR(PFR0, EL1));