Commit 22601127 authored by Christoffer Dall's avatar Christoffer Dall

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: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent e3feebf8
...@@ -835,7 +835,10 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) ...@@ -835,7 +835,10 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
no_vgic: no_vgic:
preempt_disable(); preempt_disable();
timer->enabled = 1; 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(); preempt_enable();
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment