MIPS: Set vint handler when mapping CPU interrupts

abrestic · ralfbaechle · commit f64e55dcbf84 · 2014-11-24T07:44:52.000+01:00
When mapping an interrupt in the CPU IRQ domain, set the vint handler for that interrupt if the CPU uses vectored interrupt handling. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Reviewed-by: Qais Yousef <qais.yousef@imgtec.com> Tested-by: Qais Yousef <qais.yousef@imgtec.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: Jeffrey Deans <jeffrey.deans@imgtec.com> Cc: Markos Chandras <markos.chandras@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: Jonas Gorski <jogo@openwrt.org> Cc: John Crispin <blogic@openwrt.org> Cc: David Daney <ddaney.cavm@gmail.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7802/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
@@ -36,6 +36,7 @@
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/mipsmtregs.h>
+#include <asm/setup.h>
 
 static inline void unmask_mips_irq(struct irq_data *d)
 {
@@ -124,6 +125,9 @@ static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq,
 		chip = &mips_cpu_irq_controller;
 	}
 
+	if (cpu_has_vint)
+		set_vi_handler(hw, plat_irq_dispatch);
+
 	irq_set_chip_and_handler(irq, chip, handle_percpu_irq);
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`#include <asm/irq_cpu.h>`
`37`	`37`	`#include <asm/mipsregs.h>`
`38`	`38`	`#include <asm/mipsmtregs.h>`
	`39`	`+#include <asm/setup.h>`
`39`	`40`
`40`	`41`	`static inline void unmask_mips_irq(struct irq_data *d)`
`41`	`42`	`{`
`@@ -124,6 +125,9 @@ static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq,`
`124`	`125`	`chip = &mips_cpu_irq_controller;`
`125`	`126`	`}`
`126`	`127`
	`128`	`+ if (cpu_has_vint)`
	`129`	`+ set_vi_handler(hw, plat_irq_dispatch);`
	`130`	`+`
`127`	`131`	`irq_set_chip_and_handler(irq, chip, handle_percpu_irq);`
`128`	`132`
`129`	`133`	`return 0;`