[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v7 13/28] xen/arm: Move vgic rank locking inside get_irq_priority
From: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx> Move vgic rank locking inside get_irq_priority callback. LPIs does not have vgic rank lock for reading LPI priority. So make generic vgic code cleaner. Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx> --- v7: - Updated commit message --- xen/arch/arm/vgic-v2.c | 4 +++- xen/arch/arm/vgic-v3.c | 4 +++- xen/arch/arm/vgic.c | 3 --- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 524787b..600d27e 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -519,11 +519,13 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) static int vgic_v2_get_irq_priority(struct vcpu *v, unsigned int irq) { int priority; + unsigned long flags; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); - ASSERT(spin_is_locked(&rank->lock)); + vgic_lock_rank(v, rank, flags); priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + vgic_unlock_rank(v, rank, flags); return priority; } diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 598f634..12c5d87 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1096,11 +1096,13 @@ static const struct mmio_handler_ops vgic_distr_mmio_handler = { static int vgic_v3_get_irq_priority(struct vcpu *v, unsigned int irq) { int priority; + unsigned long flags; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); - ASSERT(spin_is_locked(&rank->lock)); + vgic_lock_rank(v, rank, flags); priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + vgic_unlock_rank(v, rank, flags); return priority; } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 80a8f4e..fb2a205 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -407,14 +407,11 @@ void vgic_clear_pending_irqs(struct vcpu *v) void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq) { uint8_t priority; - struct vgic_irq_rank *rank = vgic_rank_irq(v, virq); struct pending_irq *iter, *n = irq_to_pending(v, virq); unsigned long flags; bool_t running; - vgic_lock_rank(v, rank, flags); priority = v->domain->arch.vgic.handler->get_irq_priority(v, virq); - vgic_unlock_rank(v, rank, flags); spin_lock_irqsave(&v->arch.vgic.lock, flags); -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |