diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-04-15 04:28:04 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-04-15 12:24:24 -0400 |
commit | f6da9fe45c3074b909084ae9da5f55034ebffeb4 (patch) | |
tree | c685c591ed6bb202da2b8fd204ee53a0630b652c /drivers/irqchip/irq-vic.c | |
parent | 55101e2d6ce1c780f6ee8fee5f37306971aac6cd (diff) |
irqchip: vic: Properly chain the cascaded IRQs
We are flagging the parent IRQ as chained, then we must also
make sure to call the chained_irq_[enter|exit] functions for
things to work smoothly.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: http://lkml.kernel.org/r/1397550484-7119-1-git-send-email-linus.walleij@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-vic.c')
-rw-r--r-- | drivers/irqchip/irq-vic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index 37dab0b472cd..7d35287f9e90 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/irqchip/chained_irq.h> | ||
27 | #include <linux/irqdomain.h> | 28 | #include <linux/irqdomain.h> |
28 | #include <linux/of.h> | 29 | #include <linux/of.h> |
29 | #include <linux/of_address.h> | 30 | #include <linux/of_address.h> |
@@ -228,12 +229,17 @@ static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs) | |||
228 | static void vic_handle_irq_cascaded(unsigned int irq, struct irq_desc *desc) | 229 | static void vic_handle_irq_cascaded(unsigned int irq, struct irq_desc *desc) |
229 | { | 230 | { |
230 | u32 stat, hwirq; | 231 | u32 stat, hwirq; |
232 | struct irq_chip *host_chip = irq_desc_get_chip(desc); | ||
231 | struct vic_device *vic = irq_desc_get_handler_data(desc); | 233 | struct vic_device *vic = irq_desc_get_handler_data(desc); |
232 | 234 | ||
235 | chained_irq_enter(host_chip, desc); | ||
236 | |||
233 | while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) { | 237 | while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) { |
234 | hwirq = ffs(stat) - 1; | 238 | hwirq = ffs(stat) - 1; |
235 | generic_handle_irq(irq_find_mapping(vic->domain, hwirq)); | 239 | generic_handle_irq(irq_find_mapping(vic->domain, hwirq)); |
236 | } | 240 | } |
241 | |||
242 | chained_irq_exit(host_chip, desc); | ||
237 | } | 243 | } |
238 | 244 | ||
239 | /* | 245 | /* |