Commit 57e784b4 authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Remove alternatives from sysreg accessors in VHE hypervisor context 



In the VHE hypervisor code, we should be using the remapped VHE
accessors, no ifs, no buts. No need to generate any alternative.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230609162200.2024064-9-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 659803ae

arch/arm64/include/asm/kvm_hyp.h

+19 −6
Original line number Diff line number Diff line
@@ -16,6 +16,23 @@ DECLARE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); 
DECLARE_PER_CPU(unsigned long, kvm_hyp_vector);

DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);



/*

 * Unified accessors for registers that have a different encoding

 * between VHE and non-VHE. They must be specified without their "ELx"

 * encoding, but with the SYS_ prefix, as defined in asm/sysreg.h.

 */



#if defined(__KVM_VHE_HYPERVISOR__)



#define read_sysreg_el0(r)	read_sysreg_s(r##_EL02)

#define write_sysreg_el0(v,r)	write_sysreg_s(v, r##_EL02)

#define read_sysreg_el1(r)	read_sysreg_s(r##_EL12)

#define write_sysreg_el1(v,r)	write_sysreg_s(v, r##_EL12)

#define read_sysreg_el2(r)	read_sysreg_s(r##_EL1)

#define write_sysreg_el2(v,r)	write_sysreg_s(v, r##_EL1)



#else // !__KVM_VHE_HYPERVISOR__



#define read_sysreg_elx(r,nvh,vh)					\

	({								\

		u64 reg;						\
@@ -35,12 +52,6 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); 
					 : : "rZ" (__val));		\

	} while (0)



/*

 * Unified accessors for registers that have a different encoding

 * between VHE and non-VHE. They must be specified without their "ELx"

 * encoding, but with the SYS_ prefix, as defined in asm/sysreg.h.

 */



#define read_sysreg_el0(r)	read_sysreg_elx(r, _EL0, _EL02)

#define write_sysreg_el0(v,r)	write_sysreg_elx(v, r, _EL0, _EL02)

#define read_sysreg_el1(r)	read_sysreg_elx(r, _EL1, _EL12)
@@ -48,6 +59,8 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); 
#define read_sysreg_el2(r)	read_sysreg_elx(r, _EL2, _EL1)

#define write_sysreg_el2(v,r)	write_sysreg_elx(v, r, _EL2, _EL1)



#endif	// __KVM_VHE_HYPERVISOR__



/*

 * Without an __arch_swab32(), we fall back to ___constant_swab32(), but the

 * static inline can allow the compiler to out-of-line this. KVM always wants