diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-04-28 17:12:08 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-08 10:42:09 -0400 |
commit | bffbc6eabd0e48bba5415c4aec34cb75d459c73a (patch) | |
tree | 51798198d5748bd543f5a5c5b540d1b0426eebdf /drivers/irqchip/irq-orion.c | |
parent | d7df84b3cecad4c768e4065d1d61b2f8fd02b7fa (diff) |
irqchip: orion: Reverse irq handling priority
Non-DT irq handlers were working through irq causes from most-significant
to least-significant bit, while DT irqchip driver does it the other way
round. This revealed some more HW issues on Kirkwood peripheral IP, where
spurious sdio irqs can happen although irqs are masked.
Also, the generated binaries show that original non-DT order compared
to DT order save two instructions for each bit count check:
irqchip DT order with ffs():
60: e3a06001 mov r6, #1
64: e2643000 rsb r3, r4, #0
68: e0033004 and r3, r3, r4
6c: e16f3f13 clz r3, r3
70: e263301f rsb r3, r3, #31
74: e1c44316 bic r4, r4, r6, lsl r3
78: e5971004 ldr r1, [r7, #4]
Original non-DT order with fls():
60: e3a07001 mov r7, #1
64: e16f3f14 clz r3, r4
68: e263301f rsb r3, r3, #31
6c: e1c44317 bic r4, r4, r7, lsl r3
70: e5951004 ldr r1, [r5, #4]
Therefore, reverse irq bit handling back to original order by replacing
ffs() with fls().
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398719528-23607-1-git-send-email-sebastian.hesselbarth@gmail.com
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip/irq-orion.c')
-rw-r--r-- | drivers/irqchip/irq-orion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c index e25f246cd2fb..34d18b48bb78 100644 --- a/drivers/irqchip/irq-orion.c +++ b/drivers/irqchip/irq-orion.c | |||
@@ -42,7 +42,7 @@ __exception_irq_entry orion_handle_irq(struct pt_regs *regs) | |||
42 | u32 stat = readl_relaxed(gc->reg_base + ORION_IRQ_CAUSE) & | 42 | u32 stat = readl_relaxed(gc->reg_base + ORION_IRQ_CAUSE) & |
43 | gc->mask_cache; | 43 | gc->mask_cache; |
44 | while (stat) { | 44 | while (stat) { |
45 | u32 hwirq = ffs(stat) - 1; | 45 | u32 hwirq = __fls(stat); |
46 | u32 irq = irq_find_mapping(orion_irq_domain, | 46 | u32 irq = irq_find_mapping(orion_irq_domain, |
47 | gc->irq_base + hwirq); | 47 | gc->irq_base + hwirq); |
48 | handle_IRQ(irq, regs); | 48 | handle_IRQ(irq, regs); |
@@ -117,7 +117,7 @@ static void orion_bridge_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
117 | gc->mask_cache; | 117 | gc->mask_cache; |
118 | 118 | ||
119 | while (stat) { | 119 | while (stat) { |
120 | u32 hwirq = ffs(stat) - 1; | 120 | u32 hwirq = __fls(stat); |
121 | 121 | ||
122 | generic_handle_irq(irq_find_mapping(d, gc->irq_base + hwirq)); | 122 | generic_handle_irq(irq_find_mapping(d, gc->irq_base + hwirq)); |
123 | stat &= ~(1 << hwirq); | 123 | stat &= ~(1 << hwirq); |