From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH v2 4/4] xen/arm: don't set the internal Xen timer if virt_timer is masked Date: Wed, 10 Apr 2013 16:23:55 +0100 Message-ID: <1365607435.27868.89.camel@zakaz.uk.xensource.com> References: <1361203349-24689-4-git-send-email-stefano.stabellini@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1361203349-24689-4-git-send-email-stefano.stabellini@eu.citrix.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: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" , "Tim (Xen.org)" List-Id: xen-devel@lists.xenproject.org On Mon, 2013-02-18 at 16:02 +0000, Stefano Stabellini wrote: > Changes in v2: > - do not disable interrupts in virt_timer_save because they are already > disabled during the entirety of ctxt_switch_from by a previous patch. > > Signed-off-by: Stefano Stabellini Acked + applied. I have to fixup the context due to the change to 64-but register names. > --- > xen/arch/arm/vtimer.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c > index fec363b..5d650d7 100644 > --- a/xen/arch/arm/vtimer.c > +++ b/xen/arch/arm/vtimer.c > @@ -87,7 +87,8 @@ int virt_timer_save(struct vcpu *v) > v->arch.virt_timer.ctl = READ_CP32(CNTV_CTL); > WRITE_CP32(v->arch.virt_timer.ctl & ~CNTx_CTL_ENABLE, CNTV_CTL); > v->arch.virt_timer.cval = READ_CP64(CNTV_CVAL); > - if ( v->arch.virt_timer.ctl & CNTx_CTL_ENABLE ) > + if ( (v->arch.virt_timer.ctl & CNTx_CTL_ENABLE) && > + !(v->arch.virt_timer.ctl & CNTx_CTL_MASK)) > { > set_timer(&v->arch.virt_timer.timer, ticks_to_ns(v->arch.virt_timer.cval + > v->arch.virt_timer.offset - boot_count));