4 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index d8126f2b9442..49dd64e579c2 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -59,6 +59,14 @@ config KVM_ARM_VGIC
         ---help---
           Adds support for a hardware assisted, in-kernel GIC emulation.
 
+config KVM_ARM_TIMER
+        bool "KVM support for Architected Timers"
+        depends on KVM_ARM_VGIC && ARM_ARCH_TIMER
+        select HAVE_KVM_IRQCHIP
+        default y
+        ---help---
+          Adds support for the Architected Timers in virtual machines
+
 source drivers/virtio/Kconfig
 
 endif # VIRTUALIZATION
diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile
index dece8edc2e4a..fc96ce6f2357 100644
--- a/arch/arm/kvm/Makefile
+++ b/arch/arm/kvm/Makefile
@@ -20,3 +20,4 @@ obj-y += kvm-arm.o init.o interrupts.o
 obj-y += arm.o guest.o mmu.o emulate.o reset.o
 obj-y += coproc.o coproc_a15.o mmio.o psci.o
 obj-$(CONFIG_KVM_ARM_VGIC) += vgic.o
+obj-$(CONFIG_KVM_ARM_TIMER) += arch_timer.o
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 800b2cd804d3..9ada5549216d 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -289,6 +289,7 @@ int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
 void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
 {
         kvm_mmu_free_memory_caches(vcpu);
+        kvm_timer_vcpu_terminate(vcpu);
         kmem_cache_free(kvm_vcpu_cache, vcpu);
 }
 
@@ -330,6 +331,9 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         if (ret)
                 return ret;
 
+        /* Set up the timer */
+        kvm_timer_vcpu_init(vcpu);
+
         return 0;
 }
 
@@ -1103,6 +1107,13 @@ static int init_hyp_mode(void)
                 vgic_present = true;
 #endif
 
+        /*
+         * Init HYP architected timer support
+         */
+        err = kvm_timer_hyp_init();
+        if (err)
+                goto out_free_mappings;
+
         kvm_info("Hyp mode initialized successfully\n");
         return 0;
 out_free_vfp:
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c
index 6d8407672dec..c9a17316e9fe 100644
--- a/arch/arm/kvm/vgic.c
+++ b/arch/arm/kvm/vgic.c
@@ -1418,6 +1418,7 @@ int kvm_vgic_init(struct kvm *kvm)
         for (i = VGIC_NR_PRIVATE_IRQS; i < VGIC_NR_IRQS; i += 4)
                 vgic_set_target_reg(kvm, 0, i);
 
+        kvm_timer_init(kvm);
         kvm->arch.vgic.ready = true;
 out:
         mutex_unlock(&kvm->lock);