summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-09-08 17:54:57 -0700
committerTony Lindgren <tony@atomide.com>2014-09-11 13:05:49 -0700
commitd6a7c5c84f5ddab54717914ad293ed9d99d644ff (patch)
tree7c22de102bddd3607282a07f859d346ca1e47381
parent52b1e1291334d79bb3d2fcaec15f7fc42eedbd83 (diff)
downloadop-kernel-dev-d6a7c5c84f5ddab54717914ad293ed9d99d644ff.zip
op-kernel-dev-d6a7c5c84f5ddab54717914ad293ed9d99d644ff.tar.gz
arm: omap: irq: get rid of ifdef hack
we don't need the ifdef if we have omap_nr_pending telling us how many pending registers we have on current platform. This solves a possible problem where we could try to handle bogus interrupts on OMAP2 and OMAP3 if using single zImage kernel, because we would end up reading the following pending FIQ register. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/irq.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 583a1c7..43785ee 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -234,24 +234,16 @@ static void __init omap_init_irq(u32 base, struct device_node *node)
static asmlinkage void __exception_irq_entry
omap_intc_handle_irq(struct pt_regs *regs)
{
- u32 irqnr;
+ u32 irqnr = 0;
int handled_irq = 0;
+ int i;
do {
- irqnr = intc_readl(INTC_PENDING_IRQ0);
- if (irqnr)
- goto out;
-
- irqnr = intc_readl(INTC_PENDING_IRQ1);
- if (irqnr)
- goto out;
-
- irqnr = intc_readl(INTC_PENDING_IRQ2);
-#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
- if (irqnr)
- goto out;
- irqnr = intc_readl(INTC_PENDING_IRQ3);
-#endif
+ for (i = 0; i < omap_nr_pending; i++) {
+ irqnr = intc_readl(INTC_PENDING_IRQ0 + (0x20 * i));
+ if (irqnr)
+ goto out;
+ }
out:
if (!irqnr)
OpenPOWER on IntegriCloud