Commit 7d9c1ed6 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Move FPMR into the sysreg array 



Just like SVCR, FPMR is currently stored at the wrong location.

Let's move it where it belongs.

Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Tested-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240820131802.3547589-4-maz@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent d4db9879

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ enum vcpu_sysreg { 


	/* FP/SIMD/SVE */

	SVCR,

	FPMR,



	/* 32bit specific registers. */

	DACR32_EL2,	/* Domain Access Control Register */
@@ -667,7 +668,6 @@ struct kvm_vcpu_arch { 
	void *sve_state;

	enum fp_type fp_type;

	unsigned int sve_max_vl;

	u64 fpmr;



	/* Stage 2 paging state used by the hardware on next switch */

	struct kvm_s2_mmu *hw_mmu;

arch/arm64/kvm/fpsimd.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu) 
		fp_state.sve_vl = vcpu->arch.sve_max_vl;

		fp_state.sme_state = NULL;

		fp_state.svcr = &__vcpu_sys_reg(vcpu, SVCR);

		fp_state.fpmr = &vcpu->arch.fpmr;

		fp_state.fpmr = &__vcpu_sys_reg(vcpu, FPMR);

		fp_state.fp_type = &vcpu->arch.fp_type;



		if (vcpu_has_sve(vcpu))

arch/arm64/kvm/sys_regs.c

+10 −0
Original line number Diff line number Diff line
@@ -1678,6 +1678,15 @@ static unsigned int sme_visibility(const struct kvm_vcpu *vcpu, 
	return REG_HIDDEN;

}



static unsigned int fp8_visibility(const struct kvm_vcpu *vcpu,

				   const struct sys_reg_desc *rd)

{

	if (kvm_has_fpmr(vcpu->kvm))

		return 0;



	return REG_HIDDEN;

}



static u64 read_sanitised_id_aa64pfr0_el1(struct kvm_vcpu *vcpu,

					  const struct sys_reg_desc *rd)

{
@@ -2545,6 +2554,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
			     CTR_EL0_DminLine_MASK |

			     CTR_EL0_IminLine_MASK),

	{ SYS_DESC(SYS_SVCR), undef_access, reset_val, SVCR, 0, .visibility = sme_visibility  },

	{ SYS_DESC(SYS_FPMR), undef_access, reset_val, FPMR, 0, .visibility = fp8_visibility },



	{ PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr,

	  .reg = PMCR_EL0, .get_user = get_pmcr, .set_user = set_pmcr },