Skip to content

Commit

Permalink
powerpc/86xx: Convert gef_pic_lock to raw_spinlock
Browse files Browse the repository at this point in the history
Interrupt controllers' hooks are executed in the atomic context, so
they are not permitted to sleep (with RT kernels non-raw spinlocks are
sleepable). So, gef_pic_lock has to be a real (non-sleepable) spinlock.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Mar 4, 2010
1 parent 43a5a01 commit 6f3d395
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/powerpc/platforms/86xx/gef_pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#define gef_irq_to_hw(virq) ((unsigned int)irq_map[virq].hwirq)


static DEFINE_SPINLOCK(gef_pic_lock);
static DEFINE_RAW_SPINLOCK(gef_pic_lock);

static void __iomem *gef_pic_irq_reg_base;
static struct irq_host *gef_pic_irq_host;
Expand Down Expand Up @@ -118,11 +118,11 @@ static void gef_pic_mask(unsigned int virq)

hwirq = gef_irq_to_hw(virq);

spin_lock_irqsave(&gef_pic_lock, flags);
raw_spin_lock_irqsave(&gef_pic_lock, flags);
mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
mask &= ~(1 << hwirq);
out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);
spin_unlock_irqrestore(&gef_pic_lock, flags);
raw_spin_unlock_irqrestore(&gef_pic_lock, flags);
}

static void gef_pic_mask_ack(unsigned int virq)
Expand All @@ -141,11 +141,11 @@ static void gef_pic_unmask(unsigned int virq)

hwirq = gef_irq_to_hw(virq);

spin_lock_irqsave(&gef_pic_lock, flags);
raw_spin_lock_irqsave(&gef_pic_lock, flags);
mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
mask |= (1 << hwirq);
out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);
spin_unlock_irqrestore(&gef_pic_lock, flags);
raw_spin_unlock_irqrestore(&gef_pic_lock, flags);
}

static struct irq_chip gef_pic_chip = {
Expand Down Expand Up @@ -199,7 +199,7 @@ void __init gef_pic_init(struct device_node *np)
/* Map the devices registers into memory */
gef_pic_irq_reg_base = of_iomap(np, 0);

spin_lock_irqsave(&gef_pic_lock, flags);
raw_spin_lock_irqsave(&gef_pic_lock, flags);

/* Initialise everything as masked. */
out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0);
Expand All @@ -208,7 +208,7 @@ void __init gef_pic_init(struct device_node *np)
out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0);
out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0);

spin_unlock_irqrestore(&gef_pic_lock, flags);
raw_spin_unlock_irqrestore(&gef_pic_lock, flags);

/* Map controller */
gef_pic_cascade_irq = irq_of_parse_and_map(np, 0);
Expand Down

0 comments on commit 6f3d395

Please sign in to comment.