[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v7 06/12] xen/arm: keep track of the GICH_LR used for the irq in struct pending_irq
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- Changes in v5: - don't print p->lr in case the irq is in lr_pending, as it doesn't have an LR associate to it; - improve packing of struct pending_irq; - #define GIC_INVALID_LR and use it instead of nr_lrs. --- xen/arch/arm/gic.c | 4 +++- xen/include/asm-arm/domain.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f1ce9b7..dd63f70 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -643,6 +643,7 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_PENDING, &p->status); + p->lr = lr; } static inline void gic_add_to_lr_pending(struct vcpu *v, struct pending_irq *n) @@ -721,6 +722,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) if ( p->desc != NULL ) p->desc->status &= ~IRQ_INPROGRESS; clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); + p->lr = GIC_INVALID_LR; if ( test_bit(GIC_IRQ_GUEST_PENDING, &p->status) && test_bit(GIC_IRQ_GUEST_ENABLED, &p->status)) { @@ -974,7 +976,7 @@ void gic_dump_info(struct vcpu *v) list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight ) { - printk("Inflight irq=%d\n", p->irq); + printk("Inflight irq=%d lr=%u\n", p->irq, p->lr); } list_for_each_entry( p, &v->arch.vgic.lr_pending, lr_queue ) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index bc20a15..2d94d59 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -21,7 +21,6 @@ struct vgic_irq_rank { struct pending_irq { - int irq; /* * The following two states track the lifecycle of the guest irq. * However because we are not sure and we don't want to track @@ -60,6 +59,9 @@ struct pending_irq #define GIC_IRQ_GUEST_ENABLED 2 unsigned long status; struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ + int irq; +#define GIC_INVALID_LR ~(uint8_t)0 + uint8_t lr; uint8_t priority; /* inflight is used to append instances of pending_irq to * vgic.inflight_irqs */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |