Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6749e20 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Drop hyp_alternate_select for checking for ARM64_WORKAROUND_834220 



There is no reason for using hyp_alternate_select when checking
for ARM64_WORKAROUND_834220, as each of the capabilities is
also backed by a static key. Just replace the KVM-specific
construct with cpus_have_const_cap(ARM64_WORKAROUND_834220).

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
parent 92f35b75

arch/arm64/kvm/hyp/switch.c

+2 −15
Original line number Diff line number Diff line
@@ -229,20 +229,6 @@ static void __hyp_text __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) 
	}

}



static bool __hyp_text __true_value(void)

{

	return true;

}



static bool __hyp_text __false_value(void)

{

	return false;

}



static hyp_alternate_select(__check_arm_834220,

			    __false_value, __true_value,

			    ARM64_WORKAROUND_834220);



static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)

{

	u64 par, tmp;
@@ -298,7 +284,8 @@ static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu) 
	 * resolve the IPA using the AT instruction.

	 */

	if (!(esr & ESR_ELx_S1PTW) &&

	    (__check_arm_834220()() || (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {

	    (cpus_have_const_cap(ARM64_WORKAROUND_834220) ||

	     (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {

		if (!__translate_far_to_hpfar(far, &hpfar))

			return false;

	} else {