1 files changed, 14 insertions, 9 deletions

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index e8bd288fd5be..14915c78bd99 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -293,15 +293,16 @@ static bool access_cntp_tval(struct kvm_vcpu *vcpu,
                              const struct coproc_params *p,
                              const struct coproc_reg *r)
 {
-        u64 now = kvm_phys_timer_read();
-        u64 val;
+        u32 val;
 
         if (p->is_write) {
                 val = *vcpu_reg(vcpu, p->Rt1);
-                kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL, val + now);
+                kvm_arm_timer_write_sysreg(vcpu,
+                                           TIMER_PTIMER, TIMER_REG_TVAL, val);
         } else {
-                val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL);
-                *vcpu_reg(vcpu, p->Rt1) = val - now;
+                val = kvm_arm_timer_read_sysreg(vcpu,
+                                                TIMER_PTIMER, TIMER_REG_TVAL);
+                *vcpu_reg(vcpu, p->Rt1) = val;
         }
 
         return true;
@@ -315,9 +316,11 @@ static bool access_cntp_ctl(struct kvm_vcpu *vcpu,
 
         if (p->is_write) {
                 val = *vcpu_reg(vcpu, p->Rt1);
-                kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CTL, val);
+                kvm_arm_timer_write_sysreg(vcpu,
+                                           TIMER_PTIMER, TIMER_REG_CTL, val);
         } else {
-                val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CTL);
+                val = kvm_arm_timer_read_sysreg(vcpu,
+                                                TIMER_PTIMER, TIMER_REG_CTL);
                 *vcpu_reg(vcpu, p->Rt1) = val;
         }
 
@@ -333,9 +336,11 @@ static bool access_cntp_cval(struct kvm_vcpu *vcpu,
         if (p->is_write) {
                 val = (u64)*vcpu_reg(vcpu, p->Rt2) << 32;
                 val |= *vcpu_reg(vcpu, p->Rt1);
-                kvm_arm_timer_set_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL, val);
+                kvm_arm_timer_write_sysreg(vcpu,
+                                           TIMER_PTIMER, TIMER_REG_CVAL, val);
         } else {
-                val = kvm_arm_timer_get_reg(vcpu, KVM_REG_ARM_PTIMER_CVAL);
+                val = kvm_arm_timer_read_sysreg(vcpu,
+                                                TIMER_PTIMER, TIMER_REG_CVAL);
                 *vcpu_reg(vcpu, p->Rt1) = val;
                 *vcpu_reg(vcpu, p->Rt2) = val >> 32;
         }