diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2015-09-16 16:18:59 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-09-17 13:11:18 +0100 |
| commit | c4cbba9fa078f55d9f6d081dbb4aec7cf969e7c7 (patch) | |
| tree | ea19b33ef62aa0e5c78e92d83c2e3b40c3d295e2 /arch/arm64/kvm/hyp.S | |
| parent | arm/arm64: KVM: vgic: Check for !irqchip_in_kernel() when mapping resources (diff) | |
| download | linux-dev-c4cbba9fa078f55d9f6d081dbb4aec7cf969e7c7.tar.xz linux-dev-c4cbba9fa078f55d9f6d081dbb4aec7cf969e7c7.zip | |
arm64: KVM: Disable virtual timer even if the guest is not using it
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 39aa322765f9..60a83e2900a7 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -562,8 +562,6 @@ mrs x3, cntv_ctl_el0 and x3, x3, #3 str w3, [x0, #VCPU_TIMER_CNTV_CTL] - bic x3, x3, #1 // Clear Enable - msr cntv_ctl_el0, x3 isb @@ -571,6 +569,9 @@ str x3, [x0, #VCPU_TIMER_CNTV_CVAL] 1: + // Disable the virtual timer + msr cntv_ctl_el0, xzr + // Allow physical timer/counter access for the host mrs x2, cnthctl_el2 orr x2, x2, #3 |