From: Stefano Stabellini Date: Wed, 8 May 2013 11:41:12 +0000 (+0100) Subject: xen/arm: run the vtimer Xen timers on the pcpu the vcpu is running on X-Git-Tag: 4.3.0-rc2~69 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=43e39ffc70d1adff7ff3f3f5c2abfb281589fe1c;p=people%2Fiwj%2Fxen.git xen/arm: run the vtimer Xen timers on the pcpu the vcpu is running on The Xen physical timer emulator and virtual timer driver use two internal Xen timers: initialize them on the pcpu the vcpu is running on, rather than the processor that it's creating the vcpu. On vcpu restore migrate the phys_timer and the virt_timer to the pcpu the vcpu is running on. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index 1cb365e234..393aac33da 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -48,7 +48,7 @@ int vcpu_vtimer_init(struct vcpu *v) { struct vtimer *t = &v->arch.phys_timer; - init_timer(&t->timer, phys_timer_expired, t, smp_processor_id()); + init_timer(&t->timer, phys_timer_expired, t, v->processor); t->ctl = 0; t->offset = NOW(); t->cval = NOW(); @@ -56,7 +56,7 @@ int vcpu_vtimer_init(struct vcpu *v) t->v = v; t = &v->arch.virt_timer; - init_timer(&t->timer, virt_timer_expired, t, smp_processor_id()); + init_timer(&t->timer, virt_timer_expired, t, v->processor); t->ctl = 0; t->offset = READ_SYSREG64(CNTVCT_EL0) + READ_SYSREG64(CNTVOFF_EL2); t->cval = 0; @@ -95,6 +95,8 @@ int virt_timer_restore(struct vcpu *v) return 0; stop_timer(&v->arch.virt_timer.timer); + migrate_timer(&v->arch.virt_timer.timer, v->processor); + migrate_timer(&v->arch.phys_timer.timer, v->processor); WRITE_SYSREG64(v->arch.virt_timer.offset, CNTVOFF_EL2); WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);