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

KVM: arm64: Program the timer traps with VHE layout in hVHE mode 



Just like the rest of the timer code, we need to shift the enable
bits around when HCR_EL2.E2H is set, which is the case in hVHE mode.

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


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

arch/arm64/kvm/hyp/nvhe/timer-sr.c

+12 −4
Original line number Diff line number Diff line
@@ -17,21 +17,24 @@ void __kvm_timer_set_cntvoff(u64 cntvoff) 
}



/*

 * Should only be called on non-VHE systems.

 * Should only be called on non-VHE or hVHE setups.

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

 */

void __timer_disable_traps(struct kvm_vcpu *vcpu)

{

	u64 val;

	u64 val, shift = 0;



	if (has_hvhe())

		shift = 10;



	/* Allow physical timer/counter access for the host */

	val = read_sysreg(cnthctl_el2);

	val |= CNTHCTL_EL1PCTEN | CNTHCTL_EL1PCEN;

	val |= (CNTHCTL_EL1PCTEN | CNTHCTL_EL1PCEN) << shift;

	write_sysreg(val, cnthctl_el2);

}



/*

 * Should only be called on non-VHE systems.

 * Should only be called on non-VHE or hVHE setups.

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

 */

void __timer_enable_traps(struct kvm_vcpu *vcpu)
@@ -50,5 +53,10 @@ void __timer_enable_traps(struct kvm_vcpu *vcpu) 
	else

		clr |= CNTHCTL_EL1PCTEN;



	if (has_hvhe()) {

		clr <<= 10;

		set <<= 10;

	}



	sysreg_clear_set(cnthctl_el2, clr, set);

}