| Message ID | 1395232325-19226-6-git-send-email-stefano.stabellini@eu.citrix.com |
|---|---|
| State | New |
| Headers | show |
On 03/19/2014 12:32 PM, Stefano Stabellini wrote: > Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state > parameter. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Julien Grall <julien.grall@linaro.org>
On Wed, 2014-03-19 at 12:32 +0000, Stefano Stabellini wrote: > Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state > parameter. > > @@ -689,7 +689,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int irq, > i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); > if (i < nr_lrs) { > set_bit(i, &this_cpu(lr_mask)); > - gic_set_lr(i, irq_to_pending(v, irq), state); > + gic_set_lr(i, irq_to_pending(v, irq), GICH_LR_PENDING); Is this a stray change which belopngs in another patch?
On Fri, 21 Mar 2014, Ian Campbell wrote: > On Wed, 2014-03-19 at 12:32 +0000, Stefano Stabellini wrote: > > Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state > > parameter. > > > > @@ -689,7 +689,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int irq, > > i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); > > if (i < nr_lrs) { > > set_bit(i, &this_cpu(lr_mask)); > > - gic_set_lr(i, irq_to_pending(v, irq), state); > > + gic_set_lr(i, irq_to_pending(v, irq), GICH_LR_PENDING); > > Is this a stray change which belopngs in another patch? No, in the commit message I wrote: "Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state parameter."
On Fri, 2014-03-21 at 16:20 +0000, Stefano Stabellini wrote: > On Fri, 21 Mar 2014, Ian Campbell wrote: > > On Wed, 2014-03-19 at 12:32 +0000, Stefano Stabellini wrote: > > > Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state > > > parameter. > > > > > > @@ -689,7 +689,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int irq, > > > i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); > > > if (i < nr_lrs) { > > > set_bit(i, &this_cpu(lr_mask)); > > > - gic_set_lr(i, irq_to_pending(v, irq), state); > > > + gic_set_lr(i, irq_to_pending(v, irq), GICH_LR_PENDING); > > > > Is this a stray change which belopngs in another patch? > > No, in the commit message I wrote: > > "Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state > parameter." Ah, I missed that this change was inside gic_set_guest_irq itself, sorry for the noise. Ian.
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 78e043c..a5a4da3 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -676,8 +676,8 @@ void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) spin_unlock_irqrestore(&gic.lock, flags); } -void gic_set_guest_irq(struct vcpu *v, unsigned int irq, - unsigned int state, unsigned int priority) +void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, + unsigned int priority) { int i; unsigned long flags; @@ -689,7 +689,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int irq, i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); - gic_set_lr(i, irq_to_pending(v, irq), state); + gic_set_lr(i, irq_to_pending(v, irq), GICH_LR_PENDING); goto out; } } @@ -730,7 +730,7 @@ static void gic_clear_lrs(struct vcpu *v) test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { inflight = 1; - gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + gic_raise_guest_irq(v, irq, p->priority); } spin_unlock(&gic.lock); if ( !inflight ) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 566f0ff..3913cf5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -390,7 +390,7 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) p = irq_to_pending(v, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority); + gic_raise_guest_irq(v, irq, p->priority); if ( p->desc != NULL ) p->desc->handler->enable(p->desc); i++; @@ -719,7 +719,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) /* the irq is enabled */ if ( test_bit(GIC_IRQ_GUEST_ENABLED, &n->status) ) - gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority); + gic_raise_guest_irq(v, irq, priority); list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight ) { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 6fce5c2..4834cd6 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -178,8 +178,8 @@ extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); extern void __cpuinit init_maintenance_interrupt(void); -extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq, - unsigned int state, unsigned int priority); +extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, + unsigned int priority); extern void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq); extern int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq,
Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state parameter. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- xen/arch/arm/gic.c | 8 ++++---- xen/arch/arm/vgic.c | 4 ++-- xen/include/asm-arm/gic.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)