Commit baaa76d4 authored by Marc Zyngier's avatar Marc Zyngier Committed by yanhaitao
Browse files

KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 

mainline inclusion
from mainline-v5.13-rc1
commit 83857371
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8E73O
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=83857371d4cbeff8551fa770e045be9c6b04715c



-------------------------------------------------

Switch to the unified EL1 accessors for ZCR_EL1, which will make
things easier for nVHE support.

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
parent 781ffcf6

arch/arm64/kvm/fpsimd.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kvm_host.h>

#include <asm/fpsimd.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>

#include <asm/sysreg.h>
@@ -112,7 +113,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) 
		fpsimd_save_and_flush_cpu_state();



		if (guest_has_sve)

			__vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_s(SYS_ZCR_EL12);

			__vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_el1(SYS_ZCR);

	} else if (host_has_sve) {

		/*

		 * The FPSIMD/SVE state in the CPU has not been touched, and we

arch/arm64/kvm/hyp/include/hyp/switch.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu) 
		__sve_restore_state(vcpu_sve_pffr(vcpu),

				    &vcpu->arch.ctxt.fp_regs.fpsr,

				    sve_vq_from_vl(vcpu->arch.sve_max_vl) - 1);

		write_sysreg_s(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR_EL12);

		write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR);

	} else {

		__fpsimd_restore_state(&vcpu->arch.ctxt.fp_regs);

	}