Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next

1 files changed, 42 insertions, 0 deletions

diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 0207a44917bf..72ef2d25cbf2 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
@@ -113,3 +114,44 @@ void __init mips_cpu_irq_init(void)
                 irq_set_chip_and_handler(i, &mips_cpu_irq_controller,
                                          handle_percpu_irq);
 }
+
+#ifdef CONFIG_IRQ_DOMAIN
+static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq,
+                             irq_hw_number_t hw)
+{
+        static struct irq_chip *chip;
+
+        if (hw < 2 && cpu_has_mipsmt) {
+                /* Software interrupts are used for MT/CMT IPI */
+                chip = &mips_mt_cpu_irq_controller;
+        } else {
+                chip = &mips_cpu_irq_controller;
+        }
+
+        irq_set_chip_and_handler(irq, chip, handle_percpu_irq);
+
+        return 0;
+}
+
+static const struct irq_domain_ops mips_cpu_intc_irq_domain_ops = {
+        .map = mips_cpu_intc_map,
+        .xlate = irq_domain_xlate_onecell,
+};
+
+int __init mips_cpu_intc_init(struct device_node *of_node,
+                              struct device_node *parent)
+{
+        struct irq_domain *domain;
+
+        /* Mask interrupts. */
+        clear_c0_status(ST0_IM);
+        clear_c0_cause(CAUSEF_IP);
+
+        domain = irq_domain_add_legacy(of_node, 8, MIPS_CPU_IRQ_BASE, 0,
+                                       &mips_cpu_intc_irq_domain_ops, NULL);
+        if (!domain)
+                panic("Failed to add irqdomain for MIPS CPU\n");
+
+        return 0;
+}
+#endif /* CONFIG_IRQ_DOMAIN */