1 files changed, 8 insertions, 0 deletions

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 76e38d231e99..48c6e1ac6827 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -200,6 +200,14 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
         timer->irq = irq;
 
         /*
+         * The bits in CNTV_CTL are architecturally reset to UNKNOWN for ARMv8
+         * and to 0 for ARMv7.  We provide an implementation that always
+         * resets the timer to be disabled and unmasked and is compliant with
+         * the ARMv7 architecture.
+         */
+        timer->cntv_ctl = 0;
+
+        /*
          * Tell the VGIC that the virtual interrupt is tied to a
          * physical interrupt. We do that once per VCPU.
          */