From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 8 May 2013 11:41:15 +0000 (+0100)
Subject: xen/arm: initialize vtimer offset to CNTPCT
X-Git-Tag: 4.3.0-rc2~66
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b5af4d48157d0206bcd515cb2ba4f3d4a3290d69;p=people%2Fiwj%2Fxen.git

xen/arm: initialize vtimer offset to CNTPCT

Currently we initialize the vtimer offset to

CNTVCT + CNTVOFF = CNTPCT - CNTVOFF + CNTVOFF = CNTPCT

Simply initialize vtimer offset to CNTPCT.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 97fe8ce5b9..6993425aa5 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -47,8 +47,7 @@ static void virt_timer_expired(void *data)
 int vcpu_domain_init(struct domain *d)
 {
     d->arch.phys_timer_base.offset = NOW();
-    d->arch.virt_timer_base.offset = READ_SYSREG64(CNTVCT_EL0) +
-                                     READ_SYSREG64(CNTVOFF_EL2);
+    d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0);
     return 0;
 }