diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-29 17:05:16 +0100 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-29 18:17:47 +0100 |
| commit | 22601127c0faa5db70ab88f23af11cb23c8f6cdf (patch) | |
| tree | 672f81531c199e2d5d132f40a47fb4a24fb84ab4 /virt | |
| parent | kvm: arm64: handle single-step of hyp emulated mmio instructions (diff) | |
| download | linux-22601127c0faa5db70ab88f23af11cb23c8f6cdf.tar.xz linux-22601127c0faa5db70ab88f23af11cb23c8f6cdf.zip | |
KVM: arm/arm64: Avoid attempting to load timer vgic state without a vgic
The timer optimization patches inadvertendly changed the logic to always
load the timer state as if we have a vgic, even if we don't have a vgic.
Fix this by doing the usual irqchip_in_kernel() check and call the
appropriate load function.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 190c99ed1b73..f9555b1e7f15 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -835,7 +835,10 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) no_vgic: preempt_disable(); timer->enabled = 1; - kvm_timer_vcpu_load_vgic(vcpu); + if (!irqchip_in_kernel(vcpu->kvm)) + kvm_timer_vcpu_load_user(vcpu); + else + kvm_timer_vcpu_load_vgic(vcpu); preempt_enable(); return 0; |