KVM: arm64: Move SVCR into the sysreg array

SVCR is just a system register, and has no purpose being outside
of the sysreg array. If anything, it only makes it more difficult
to eventually support SME one day. If ever.

Move it into the array with its little friends, and associate it
with a visibility predicate.

Although this is dead code, it at least paves the way for the
next set of FP-related extensions.

Reviewed-by: Mark Brown <broonie@kernel.org>
Tested-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240820131802.3547589-2-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index a33f5996ca9f1d45502d769bb40656b901815af0..e244e3176b56bbc9674be5801c44ca7423514342 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -446,6 +446,9 @@ enum vcpu_sysreg {
        GCR_EL1,        /* Tag Control Register */
        TFSRE0_EL1,     /* Tag Fault Status Register (EL0) */
 
+       /* FP/SIMD/SVE */
+       SVCR,
+
        /* 32bit specific registers. */
        DACR32_EL2,     /* Domain Access Control Register */
        IFSR32_EL2,     /* Instruction Fault Status Register */
@@ -664,7 +667,6 @@ struct kvm_vcpu_arch {
        void *sve_state;
        enum fp_type fp_type;
        unsigned int sve_max_vl;
-       u64 svcr;
        u64 fpmr;
 
        /* Stage 2 paging state used by the hardware on next switch */

diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c
index c53e5b14038dce9d22490c7b5c7d7e9e31969133..e6425414d301f3362d910edcf82eb01ebfd21a5b 100644 (file)
--- a/arch/arm64/kvm/fpsimd.c
+++ b/arch/arm64/kvm/fpsimd.c
@@ -134,7 +134,7 @@ void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu)
                fp_state.sve_state = vcpu->arch.sve_state;
                fp_state.sve_vl = vcpu->arch.sve_max_vl;
                fp_state.sme_state = NULL;
-               fp_state.svcr = &vcpu->arch.svcr;
+               fp_state.svcr = &__vcpu_sys_reg(vcpu, SVCR);
                fp_state.fpmr = &vcpu->arch.fpmr;
                fp_state.fp_type = &vcpu->arch.fp_type;
 

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index c90324060436b272fd0f7dde8e023a7911edcc7b..2dc6cab43b2f8a7bb5923911fce04a45ede161ec 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1669,6 +1669,15 @@ static unsigned int sve_visibility(const struct kvm_vcpu *vcpu,
        return REG_HIDDEN;
 }
 
+static unsigned int sme_visibility(const struct kvm_vcpu *vcpu,
+                                  const struct sys_reg_desc *rd)
+{
+       if (kvm_has_feat(vcpu->kvm, ID_AA64PFR1_EL1, SME, IMP))
+               return 0;
+
+       return REG_HIDDEN;
+}
+
 static u64 read_sanitised_id_aa64pfr0_el1(struct kvm_vcpu *vcpu,
                                          const struct sys_reg_desc *rd)
 {
@@ -2535,7 +2544,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
                             CTR_EL0_IDC_MASK |
                             CTR_EL0_DminLine_MASK |
                             CTR_EL0_IminLine_MASK),
-       { SYS_DESC(SYS_SVCR), undef_access },
+       { SYS_DESC(SYS_SVCR), undef_access, reset_val, SVCR, 0, .visibility = sme_visibility  },
 
        { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr,
          .reg = PMCR_EL0, .get_user = get_pmcr, .set_user = set_pmcr },