1 files changed, 32 insertions, 42 deletions

diff --git a/virt/kvm/arm/hyp/timer-sr.c b/virt/kvm/arm/hyp/timer-sr.c
index 4734915ab71f..f39861639f08 100644
--- a/virt/kvm/arm/hyp/timer-sr.c
+++ b/virt/kvm/arm/hyp/timer-sr.c
@@ -21,58 +21,48 @@
 
 #include <asm/kvm_hyp.h>
 
-/* vcpu is already in the HYP VA space */
-void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu)
+void __hyp_text __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high)
+{
+        u64 cntvoff = (u64)cntvoff_high << 32 | cntvoff_low;
+        write_sysreg(cntvoff, cntvoff_el2);
+}
+
+void __hyp_text enable_el1_phys_timer_access(void)
 {
-        struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-        struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);
         u64 val;
 
-        if (timer->enabled) {
-                vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl);
-                vtimer->cnt_cval = read_sysreg_el0(cntv_cval);
-        }
+        /* Allow physical timer/counter access for the host */
+        val = read_sysreg(cnthctl_el2);
+        val |= CNTHCTL_EL1PCTEN | CNTHCTL_EL1PCEN;
+        write_sysreg(val, cnthctl_el2);
+}
 
-        /* Disable the virtual timer */
-        write_sysreg_el0(0, cntv_ctl);
+void __hyp_text disable_el1_phys_timer_access(void)
+{
+        u64 val;
 
         /*
+         * Disallow physical timer access for the guest
+         * Physical counter access is allowed
+         */
+        val = read_sysreg(cnthctl_el2);
+        val &= ~CNTHCTL_EL1PCEN;
+        val |= CNTHCTL_EL1PCTEN;
+        write_sysreg(val, cnthctl_el2);
+}
+
+void __hyp_text __timer_disable_traps(struct kvm_vcpu *vcpu)
+{
+        /*
          * We don't need to do this for VHE since the host kernel runs in EL2
          * with HCR_EL2.TGE ==1, which makes those bits have no impact.
          */
-        if (!has_vhe()) {
-                /* Allow physical timer/counter access for the host */
-                val = read_sysreg(cnthctl_el2);
-                val |= CNTHCTL_EL1PCTEN | CNTHCTL_EL1PCEN;
-                write_sysreg(val, cnthctl_el2);
-        }
-
-        /* Clear cntvoff for the host */
-        write_sysreg(0, cntvoff_el2);
+        if (!has_vhe())
+                enable_el1_phys_timer_access();
 }
 
-void __hyp_text __timer_restore_state(struct kvm_vcpu *vcpu)
+void __hyp_text __timer_enable_traps(struct kvm_vcpu *vcpu)
 {
-        struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-        struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);
-        u64 val;
-
-        /* Those bits are already configured at boot on VHE-system */
-        if (!has_vhe()) {
-                /*
-                 * Disallow physical timer access for the guest
-                 * Physical counter access is allowed
-                 */
-                val = read_sysreg(cnthctl_el2);
-                val &= ~CNTHCTL_EL1PCEN;
-                val |= CNTHCTL_EL1PCTEN;
-                write_sysreg(val, cnthctl_el2);
-        }
-
-        if (timer->enabled) {
-                write_sysreg(vtimer->cntvoff, cntvoff_el2);
-                write_sysreg_el0(vtimer->cnt_cval, cntv_cval);
-                isb();
-                write_sysreg_el0(vtimer->cnt_ctl, cntv_ctl);
-        }
+        if (!has_vhe())
+                disable_el1_phys_timer_access();
 }