Commit c1c90728 authored Nov 22, 2015 by Nicolas Pitre Committed by Jason Cooper Nov 25, 2015

ARM: dove: Fix legacy get_irqnr_and_base



Commit 5d6bed2a ("ARM: dove: fix legacy dove IRQ numbers") shifted
IRQ numbers by one but didn't update the get_irqnr_and_base macro
accordingly.  This macro is involved when CONFIG_MULTI_IRQ_HANDLER
is not defined.

[jac: 5d6bed2a went in to v4.2, but was backported to v3.18]

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Fixes: 5d6bed2a ("ARM: dove: fix legacy dove IRQ numbers")
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent 5442f0ea

arch/arm/mach-dove/include/mach/entry-macro.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,13 +18,13 @@
		@ check low interrupts
		ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
		ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
		mov \irqnr, #31
		mov \irqnr, #32
		ands \irqstat, \irqstat, \tmp

		@ if no low interrupts set, check high interrupts
		ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
		ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF]
		moveq \irqnr, #63
		moveq \irqnr, #64
		andeqs \irqstat, \irqstat, \tmp

		@ find first active interrupt source