KVM: arm64: nv: Expose FEAT_DF2 to NV-enabled VMs

The supporting infrastructure in KVM's abort injection code was merged a
while ago, but the author (me!) forgot to relax the NV limitation when
FEAT_DF2 got exposed to non-NV VMs. Fix it.

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 4044dc66fa3920df672e2fd90cc2af8bb9221391..5e46e95e26848acf02c3ceac0b02dfad141ebc7f 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -1463,7 +1463,6 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val)
        case SYS_ID_AA64PFR1_EL1:
                /* Only support BTI, SSBS, CSV2_frac */
                val &= ~(ID_AA64PFR1_EL1_PFAR           |
-                        ID_AA64PFR1_EL1_DF2            |
                         ID_AA64PFR1_EL1_MTEX           |
                         ID_AA64PFR1_EL1_THE            |
                         ID_AA64PFR1_EL1_GCS            |