From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 14/21] arm/vtimer: convert result to ticks when reading CNTPCT register Date: Fri, 5 Oct 2012 10:38:20 +0000 Message-ID: <1349433507-21148-14-git-send-email-ian.campbell@citrix.com> References: <1349433418.20946.46.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1349433418.20946.46.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: tim@xen.org, Ian Campbell , stefano.stabelini@citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/vtimer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 6b1152e..490b021 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -103,6 +103,7 @@ static int vtimer_emulate_64(struct cpu_user_regs *regs, union hsr hsr) struct hsr_cp64 cp64 = hsr.cp64; uint32_t *r1 = ®s->r0 + cp64.reg1; uint32_t *r2 = ®s->r0 + cp64.reg2; + uint64_t ticks; s_time_t now; switch ( hsr.bits & HSR_CP64_REGS_MASK ) @@ -111,8 +112,9 @@ static int vtimer_emulate_64(struct cpu_user_regs *regs, union hsr hsr) if ( cp64.read ) { now = NOW() - v->arch.vtimer.offset; - *r1 = (uint32_t)(now & 0xffffffff); - *r2 = (uint32_t)(now >> 32); + ticks = ns_to_ticks(now); + *r1 = (uint32_t)(ticks & 0xffffffff); + *r2 = (uint32_t)(ticks >> 32); return 1; } else -- 1.7.9.1