GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-25 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: KVM: Disable virtual timer even if the guest is not using it

Browse source 
When running a guest with the architected timer disabled (with QEMU and
the kernel_irqchip=off option, for example), it is important to make
sure the timer gets turned off. Otherwise, the guest may try to
enable it anyway, leading to a screaming HW interrupt.

The fix is to unconditionally turn off the virtual timer on guest
exit.

Cc: stable@vger.kernel.org
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2015-09-16 16:18:59 +01:00
parent c2f58514cf
commit c4cbba9fa0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/arm64/kvm/hyp.S
View file

@ -562,8 +562,6 @@
mrs x3, cntv_ctl_el0 mrs x3, cntv_ctl_el0
and x3, x3, #3 and x3, x3, #3
str w3, [x0, #VCPU_TIMER_CNTV_CTL] str w3, [x0, #VCPU_TIMER_CNTV_CTL]
bic x3, x3, #1 // Clear Enable
msr cntv_ctl_el0, x3
isb isb
@ -571,6 +569,9 @@
str x3, [x0, #VCPU_TIMER_CNTV_CVAL] str x3, [x0, #VCPU_TIMER_CNTV_CVAL]
1: 1:
// Disable the virtual timer
msr cntv_ctl_el0, xzr
// Allow physical timer/counter access for the host // Allow physical timer/counter access for the host
mrs x2, cnthctl_el2 mrs x2, cnthctl_el2
orr x2, x2, #3 orr x2, x2, #3