Commit b2b36316 authored by Marc Zyngier's avatar Marc Zyngier Committed by Eric Miao

[ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y

Commit d2c37068 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling)
broke ISA interrupt support on pxa27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from
ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (pxa270), with both CONFIG_PXA_HAVE_ISA_IRQS
enabled and disabled.
Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Tested-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 156171c7
...@@ -46,5 +46,6 @@ ...@@ -46,5 +46,6 @@
beq 1001f beq 1001f
bic \irqstat, \irqstat, #0x80000000 bic \irqstat, \irqstat, #0x80000000
mov \irqnr, \irqstat, lsr #16 mov \irqnr, \irqstat, lsr #16
add \irqnr, \irqnr, #(PXA_IRQ(0))
1001: 1001:
.endm .endm
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment