Commit 90ae31c6 authored by Fuad Tabba's avatar Fuad Tabba Committed by Oliver Upton
Browse files

KVM: arm64: Helper to write to appropriate feature trap register based on mode 



Factor out the code that decides whether to write to the feature
trap registers, CPTR_EL2 or CPACR_EL1, based on the KVM mode,
i.e., (h)VHE or nVHE.

This function will be used in the subsequent patch.

No functional change intended.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230724123829.2929609-6-tabba@google.com


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

arch/arm64/include/asm/kvm_emulate.h

+9 −4
Original line number Diff line number Diff line
@@ -571,6 +571,14 @@ static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature) 
	return test_bit(feature, vcpu->arch.features);

}



static __always_inline void kvm_write_cptr_el2(u64 val)

{

	if (has_vhe() || has_hvhe())

		write_sysreg(val, cpacr_el1);

	else

		write_sysreg(val, cptr_el2);

}



static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu)

{

	u64 val;
@@ -597,9 +605,6 @@ static __always_inline void kvm_reset_cptr_el2(struct kvm_vcpu *vcpu) 
{

	u64 val = kvm_get_reset_cptr_el2(vcpu);



	if (has_vhe() || has_hvhe())

		write_sysreg(val, cpacr_el1);

	else

		write_sysreg(val, cptr_el2);

	kvm_write_cptr_el2(val);

}

#endif /* __ARM64_KVM_EMULATE_H__ */