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

Commit 04fef057 authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm64: Remove noop calls to timer save/restore from VHE switch 



The VHE switch function calls __timer_enable_traps and
__timer_disable_traps which don't do anything on VHE systems.
Therefore, simply remove these calls from the VHE switch function and
make the functions non-conditional as they are now only called from the
non-VHE switch path.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 34f8cdf1

arch/arm64/kvm/hyp/switch.c

+0 −2
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) 
	__activate_vm(vcpu->kvm);



	__vgic_restore_state(vcpu);

	__timer_enable_traps(vcpu);



	/*

	 * We must restore the 32-bit state before the sysregs, thanks
@@ -400,7 +399,6 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) 


	__sysreg_save_guest_state(guest_ctxt);

	__sysreg32_save_state(vcpu);

	__timer_disable_traps(vcpu);

	__vgic_save_state(vcpu);



	__deactivate_traps(vcpu);

virt/kvm/arm/hyp/timer-sr.c

+22 −22
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ void __hyp_text __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high) 
	write_sysreg(cntvoff, cntvoff_el2);

}



void __hyp_text __timer_disable_traps(struct kvm_vcpu *vcpu)

{

/*

	 * We don't need to do this for VHE since the host kernel runs in EL2

	 * with HCR_EL2.TGE ==1, which makes those bits have no impact.

 * Should only be called on non-VHE systems.

 * VHE systems use EL2 timers and configure EL1 timers in kvm_timer_init_vhe().

 */

	if (!has_vhe()) {

void __hyp_text __timer_disable_traps(struct kvm_vcpu *vcpu)

{

	u64 val;



	/* Allow physical timer/counter access for the host */
@@ -41,11 +40,13 @@ void __hyp_text __timer_disable_traps(struct kvm_vcpu *vcpu) 
	val |= CNTHCTL_EL1PCTEN | CNTHCTL_EL1PCEN;

	write_sysreg(val, cnthctl_el2);

}

}



/*

 * Should only be called on non-VHE systems.

 * VHE systems use EL2 timers and configure EL1 timers in kvm_timer_init_vhe().

 */

void __hyp_text __timer_enable_traps(struct kvm_vcpu *vcpu)

{

	if (!has_vhe()) {

	u64 val;



	/*
@@ -57,4 +58,3 @@ void __hyp_text __timer_enable_traps(struct kvm_vcpu *vcpu) 
	val |= CNTHCTL_EL1PCTEN;

	write_sysreg(val, cnthctl_el2);

}
 
}