KVM: arm/arm64: Abstract virtual timer context into separate structure

Abstract virtual timer context into a separate structure and change all
callers referring to timer registers, irq state and so on. No change in
functionality.

This is about to become very handy when adding the EL1 physical timer.

Signed-off-by: Jintack Lim <jintack@cs.columbia.edu>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index 5c970ce67949..daad3c133b9f 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -28,15 +28,20 @@ struct arch_timer_kvm {
         u64                     cntvoff;
 };
 
-struct arch_timer_cpu {
+struct arch_timer_context {
         /* Registers: control register, timer value */
-        u32                             cntv_ctl;       /* Saved/restored */
-        u64                             cntv_cval;      /* Saved/restored */
+        u32                             cnt_ctl;
+        u64                             cnt_cval;
+
+        /* Timer IRQ */
+        struct kvm_irq_level            irq;
+
+        /* Active IRQ state caching */
+        bool                            active_cleared_last;
+};
 
-        /*
-         * Anything that is not used directly from assembly code goes
-         * here.
-         */
+struct arch_timer_cpu {
+        struct arch_timer_context       vtimer;
 
         /* Background timer used when the guest is not running */
         struct hrtimer                  timer;
@@ -47,12 +52,6 @@ struct arch_timer_cpu {
         /* Background timer active */
         bool                            armed;
 
-        /* Timer IRQ */
-        struct kvm_irq_level            irq;
-
-        /* Active IRQ state caching */
-        bool                            active_cleared_last;
-
         /* Is the timer enabled */
         bool                    enabled;
 };
@@ -77,4 +76,6 @@ void kvm_timer_unschedule(struct kvm_vcpu *vcpu);
 void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu);
 
 void kvm_timer_init_vhe(void);
+
+#define vcpu_vtimer(v)  (&(v)->arch.timer_cpu.vtimer)
 #endif