Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "MIPS fixes for 3.11.  Half of then is for Netlogic the remainder
  touches things across arch/mips.

  Nothing really dramatic and by rc1 standards MIPS will be in fairly
  good shape with this applied.  Tested by building all MIPS defconfigs
  of which with this pull request four platforms won't build.  And yes,
  it boots also on my favorite test systems"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: kvm: Kconfig: Drop HAVE_KVM dependency from VIRTUALIZATION
  MIPS: Octeon: Fix DT pruning bug with pip ports
  MIPS: KVM: Mark KVM_GUEST (T&E KVM) as BROKEN_ON_SMP
  MIPS: tlbex: fix broken build in v3.11-rc1
  MIPS: Netlogic: Add XLP PIC irqdomain
  MIPS: Netlogic: Fix USB block's coherent DMA mask
  MIPS: tlbex: Fix typo in r3000 tlb store handler
  MIPS: BMIPS: Fix thinko to release slave TP from reset
  MIPS: Delete dead invocation of exception_exit().

1 files changed, 57 insertions, 11 deletions

diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index 73facb2b33bb..1c7e3a1b81ab 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -40,6 +40,10 @@
 #include <linux/slab.h>
 #include <linux/irq.h>
 
+#include <linux/irqdomain.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
 #include <asm/errno.h>
 #include <asm/signal.h>
 #include <asm/ptrace.h>
@@ -223,17 +227,6 @@ static void nlm_init_node_irqs(int node)
         nodep->irqmask = irqmask;
 }
 
-void __init arch_init_irq(void)
-{
-        /* Initialize the irq descriptors */
-        nlm_init_percpu_irqs();
-        nlm_init_node_irqs(0);
-        write_c0_eimr(nlm_current_node()->irqmask);
-#if defined(CONFIG_CPU_XLR)
-        nlm_setup_fmn_irq();
-#endif
-}
-
 void nlm_smp_irq_init(int hwcpuid)
 {
         int node, cpu;
@@ -266,3 +259,56 @@ asmlinkage void plat_irq_dispatch(void)
         /* top level irq handling */
         do_IRQ(nlm_irq_to_xirq(node, i));
 }
+
+#ifdef CONFIG_OF
+static struct irq_domain *xlp_pic_domain;
+
+static const struct irq_domain_ops xlp_pic_irq_domain_ops = {
+        .xlate = irq_domain_xlate_onetwocell,
+};
+
+static int __init xlp_of_pic_init(struct device_node *node,
+                                        struct device_node *parent)
+{
+        const int n_picirqs = PIC_IRT_LAST_IRQ - PIC_IRQ_BASE + 1;
+        struct resource res;
+        int socid, ret;
+
+        /* we need a hack to get the PIC's SoC chip id */
+        ret = of_address_to_resource(node, 0, &res);
+        if (ret < 0) {
+                pr_err("PIC %s: reg property not found!\n", node->name);
+                return -EINVAL;
+        }
+        socid = (res.start >> 18) & 0x3;
+        xlp_pic_domain = irq_domain_add_legacy(node, n_picirqs,
+                nlm_irq_to_xirq(socid, PIC_IRQ_BASE), PIC_IRQ_BASE,
+                &xlp_pic_irq_domain_ops, NULL);
+        if (xlp_pic_domain == NULL) {
+                pr_err("PIC %s: Creating legacy domain failed!\n", node->name);
+                return -EINVAL;
+        }
+        pr_info("Node %d: IRQ domain created for PIC@%pa\n", socid,
+                                                        &res.start);
+        return 0;
+}
+
+static struct of_device_id __initdata xlp_pic_irq_ids[] = {
+        { .compatible = "netlogic,xlp-pic", .data = xlp_of_pic_init },
+        {},
+};
+#endif
+
+void __init arch_init_irq(void)
+{
+        /* Initialize the irq descriptors */
+        nlm_init_percpu_irqs();
+        nlm_init_node_irqs(0);
+        write_c0_eimr(nlm_current_node()->irqmask);
+#if defined(CONFIG_CPU_XLR)
+        nlm_setup_fmn_irq();
+#endif
+#if defined(CONFIG_OF)
+        of_irq_init(xlp_pic_irq_ids);
+#endif
+}