diff options
author | Milton Miller <miltonm@bga.com> | 2011-05-10 15:30:18 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 01:31:49 -0400 |
commit | 67347eba156d64150be73c9f5797342a66b123d9 (patch) | |
tree | 6778f8fe44efc633e9169a722628d8e86d9eeb17 /arch/powerpc/platforms/52xx | |
parent | c42385cd4533b5ba9b9dd0034285cfcfd7982708 (diff) |
powerpc/mpc62xx_pic: Fix get_irq handling of NO_IRQ
If none of irq category bits were set mpc52xx_get_irq() would pass
NO_IRQ_IGNORE (-1) to irq_linear_revmap, which does an unsigned compare
and declares the interrupt above the linear map range. It then punts
to irq_find_mapping, which performs a linear search of all irqs,
which will likely miss and only then return NO_IRQ.
If no status bit is set, then we should return NO_IRQ directly.
The interrupt should not be suppressed from spurious counting, in fact
that is the definition of supurious.
Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/52xx')
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c index bb611819b832..1a9a49570579 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c | |||
@@ -486,7 +486,7 @@ void __init mpc52xx_init_irq(void) | |||
486 | unsigned int mpc52xx_get_irq(void) | 486 | unsigned int mpc52xx_get_irq(void) |
487 | { | 487 | { |
488 | u32 status; | 488 | u32 status; |
489 | int irq = NO_IRQ_IGNORE; | 489 | int irq; |
490 | 490 | ||
491 | status = in_be32(&intr->enc_status); | 491 | status = in_be32(&intr->enc_status); |
492 | if (status & 0x00000400) { /* critical */ | 492 | if (status & 0x00000400) { /* critical */ |
@@ -509,6 +509,8 @@ unsigned int mpc52xx_get_irq(void) | |||
509 | } else { | 509 | } else { |
510 | irq |= (MPC52xx_IRQ_L1_PERP << MPC52xx_IRQ_L1_OFFSET); | 510 | irq |= (MPC52xx_IRQ_L1_PERP << MPC52xx_IRQ_L1_OFFSET); |
511 | } | 511 | } |
512 | } else { | ||
513 | return NO_IRQ; | ||
512 | } | 514 | } |
513 | 515 | ||
514 | return irq_linear_revmap(mpc52xx_irqhost, irq); | 516 | return irq_linear_revmap(mpc52xx_irqhost, irq); |