Merge tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux

Pull Xtensa patches from Chris Zankel:
 "The major changes are adding support for SMP for Xtensa, fixing and
  cleaning up the ISS (simulator) network driver, and better support for
  device trees"

* tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux: (40 commits)
  xtensa: implement ndelay
  xtensa: clean up udelay
  xtensa: enable HAVE_PERF_EVENTS
  xtensa: remap io area defined in device tree
  xtensa: support default device tree buses
  xtensa: initialize device tree clock sources
  xtensa: xtfpga: fix definitions of platform devices
  xtensa: standardize devicetree cpu compatible strings
  xtensa: avoid duplicate of IO range definitions
  xtensa: fix ATOMCTL register documentation
  xtensa: Enable irqs after cpu is set online
  xtensa: ISS: raise network polling rate to 10 times/sec
  xtensa: remove unused XTENSA_ISS_NETWORK Kconfig parameter
  xtensa: ISS: avoid simple_strtoul usage
  xtensa: Switch to sched_clock_register()
  xtensa: implement CPU hotplug
  xtensa: add SMP support
  xtensa: add MX irqchip
  xtensa: clear timer IRQ unconditionally in its handler
  xtensa: clean up do_interrupt/do_IRQ
  ...

4 files changed, 278 insertions, 0 deletions

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 940638ddc982..61ffdca96e25 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -65,3 +65,7 @@ config VERSATILE_FPGA_IRQ_NR
        int
        default 4
        depends on VERSATILE_FPGA_IRQ
+
+config XTENSA_MX
+        bool
+        select IRQ_DOMAIN
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 6427323af4c3..86b484cb3ec2 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -23,3 +23,5 @@ obj-$(CONFIG_RENESAS_IRQC)		+= irq-renesas-irqc.o
 obj-$(CONFIG_VERSATILE_FPGA_IRQ)        += irq-versatile-fpga.o
 obj-$(CONFIG_ARCH_VT8500)               += irq-vt8500.o
 obj-$(CONFIG_TB10X_IRQC)                += irq-tb10x.o
+obj-$(CONFIG_XTENSA)                    += irq-xtensa-pic.o
+obj-$(CONFIG_XTENSA_MX)                 += irq-xtensa-mx.o
diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-mx.c
new file mode 100644
index 000000000000..f693f1bc1348
--- /dev/null
+++ b/drivers/irqchip/irq-xtensa-mx.c
@@ -0,0 +1,164 @@
+/*
+ * Xtensa MX interrupt distributor
+ *
+ * Copyright (C) 2002 - 2013 Tensilica, Inc.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irqdomain.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+
+#include <asm/mxregs.h>
+
+#include "irqchip.h"
+
+#define HW_IRQ_IPI_COUNT 2
+#define HW_IRQ_MX_BASE 2
+#define HW_IRQ_EXTERN_BASE 3
+
+static DEFINE_PER_CPU(unsigned int, cached_irq_mask);
+
+static int xtensa_mx_irq_map(struct irq_domain *d, unsigned int irq,
+                irq_hw_number_t hw)
+{
+        if (hw < HW_IRQ_IPI_COUNT) {
+                struct irq_chip *irq_chip = d->host_data;
+                irq_set_chip_and_handler_name(irq, irq_chip,
+                                handle_percpu_irq, "ipi");
+                irq_set_status_flags(irq, IRQ_LEVEL);
+                return 0;
+        }
+        return xtensa_irq_map(d, irq, hw);
+}
+
+/*
+ * Device Tree IRQ specifier translation function which works with one or
+ * two cell bindings. First cell value maps directly to the hwirq number.
+ * Second cell if present specifies whether hwirq number is external (1) or
+ * internal (0).
+ */
+static int xtensa_mx_irq_domain_xlate(struct irq_domain *d,
+                struct device_node *ctrlr,
+                const u32 *intspec, unsigned int intsize,
+                unsigned long *out_hwirq, unsigned int *out_type)
+{
+        return xtensa_irq_domain_xlate(intspec, intsize,
+                        intspec[0], intspec[0] + HW_IRQ_EXTERN_BASE,
+                        out_hwirq, out_type);
+}
+
+static const struct irq_domain_ops xtensa_mx_irq_domain_ops = {
+        .xlate = xtensa_mx_irq_domain_xlate,
+        .map = xtensa_mx_irq_map,
+};
+
+void secondary_init_irq(void)
+{
+        __this_cpu_write(cached_irq_mask,
+                        XCHAL_INTTYPE_MASK_EXTERN_EDGE |
+                        XCHAL_INTTYPE_MASK_EXTERN_LEVEL);
+        set_sr(XCHAL_INTTYPE_MASK_EXTERN_EDGE |
+                        XCHAL_INTTYPE_MASK_EXTERN_LEVEL, intenable);
+}
+
+static void xtensa_mx_irq_mask(struct irq_data *d)
+{
+        unsigned int mask = 1u << d->hwirq;
+
+        if (mask & (XCHAL_INTTYPE_MASK_EXTERN_EDGE |
+                                XCHAL_INTTYPE_MASK_EXTERN_LEVEL)) {
+                set_er(1u << (xtensa_get_ext_irq_no(d->hwirq) -
+                                        HW_IRQ_MX_BASE), MIENG);
+        } else {
+                mask = __this_cpu_read(cached_irq_mask) & ~mask;
+                __this_cpu_write(cached_irq_mask, mask);
+                set_sr(mask, intenable);
+        }
+}
+
+static void xtensa_mx_irq_unmask(struct irq_data *d)
+{
+        unsigned int mask = 1u << d->hwirq;
+
+        if (mask & (XCHAL_INTTYPE_MASK_EXTERN_EDGE |
+                                XCHAL_INTTYPE_MASK_EXTERN_LEVEL)) {
+                set_er(1u << (xtensa_get_ext_irq_no(d->hwirq) -
+                                        HW_IRQ_MX_BASE), MIENGSET);
+        } else {
+                mask |= __this_cpu_read(cached_irq_mask);
+                __this_cpu_write(cached_irq_mask, mask);
+                set_sr(mask, intenable);
+        }
+}
+
+static void xtensa_mx_irq_enable(struct irq_data *d)
+{
+        variant_irq_enable(d->hwirq);
+        xtensa_mx_irq_unmask(d);
+}
+
+static void xtensa_mx_irq_disable(struct irq_data *d)
+{
+        xtensa_mx_irq_mask(d);
+        variant_irq_disable(d->hwirq);
+}
+
+static void xtensa_mx_irq_ack(struct irq_data *d)
+{
+        set_sr(1 << d->hwirq, intclear);
+}
+
+static int xtensa_mx_irq_retrigger(struct irq_data *d)
+{
+        set_sr(1 << d->hwirq, intset);
+        return 1;
+}
+
+static int xtensa_mx_irq_set_affinity(struct irq_data *d,
+                const struct cpumask *dest, bool force)
+{
+        unsigned mask = 1u << cpumask_any(dest);
+
+        set_er(mask, MIROUT(d->hwirq - HW_IRQ_MX_BASE));
+        return 0;
+
+}
+
+static struct irq_chip xtensa_mx_irq_chip = {
+        .name           = "xtensa-mx",
+        .irq_enable     = xtensa_mx_irq_enable,
+        .irq_disable    = xtensa_mx_irq_disable,
+        .irq_mask       = xtensa_mx_irq_mask,
+        .irq_unmask     = xtensa_mx_irq_unmask,
+        .irq_ack        = xtensa_mx_irq_ack,
+        .irq_retrigger  = xtensa_mx_irq_retrigger,
+        .irq_set_affinity = xtensa_mx_irq_set_affinity,
+};
+
+int __init xtensa_mx_init_legacy(struct device_node *interrupt_parent)
+{
+        struct irq_domain *root_domain =
+                irq_domain_add_legacy(NULL, NR_IRQS, 0, 0,
+                                &xtensa_mx_irq_domain_ops,
+                                &xtensa_mx_irq_chip);
+        irq_set_default_host(root_domain);
+        secondary_init_irq();
+        return 0;
+}
+
+static int __init xtensa_mx_init(struct device_node *np,
+                struct device_node *interrupt_parent)
+{
+        struct irq_domain *root_domain =
+                irq_domain_add_linear(np, NR_IRQS, &xtensa_mx_irq_domain_ops,
+                                &xtensa_mx_irq_chip);
+        irq_set_default_host(root_domain);
+        secondary_init_irq();
+        return 0;
+}
+IRQCHIP_DECLARE(xtensa_mx_irq_chip, "cdns,xtensa-mx", xtensa_mx_init);
diff --git a/drivers/irqchip/irq-xtensa-pic.c b/drivers/irqchip/irq-xtensa-pic.c
new file mode 100644
index 000000000000..7d71126d1ce5
--- /dev/null
+++ b/drivers/irqchip/irq-xtensa-pic.c
@@ -0,0 +1,108 @@
+/*
+ * Xtensa built-in interrupt controller
+ *
+ * Copyright (C) 2002 - 2013 Tensilica, Inc.
+ * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Chris Zankel <chris@zankel.net>
+ * Kevin Chea
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irqdomain.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+
+#include "irqchip.h"
+
+unsigned int cached_irq_mask;
+
+/*
+ * Device Tree IRQ specifier translation function which works with one or
+ * two cell bindings. First cell value maps directly to the hwirq number.
+ * Second cell if present specifies whether hwirq number is external (1) or
+ * internal (0).
+ */
+static int xtensa_pic_irq_domain_xlate(struct irq_domain *d,
+                struct device_node *ctrlr,
+                const u32 *intspec, unsigned int intsize,
+                unsigned long *out_hwirq, unsigned int *out_type)
+{
+        return xtensa_irq_domain_xlate(intspec, intsize,
+                        intspec[0], intspec[0],
+                        out_hwirq, out_type);
+}
+
+static const struct irq_domain_ops xtensa_irq_domain_ops = {
+        .xlate = xtensa_pic_irq_domain_xlate,
+        .map = xtensa_irq_map,
+};
+
+static void xtensa_irq_mask(struct irq_data *d)
+{
+        cached_irq_mask &= ~(1 << d->hwirq);
+        set_sr(cached_irq_mask, intenable);
+}
+
+static void xtensa_irq_unmask(struct irq_data *d)
+{
+        cached_irq_mask |= 1 << d->hwirq;
+        set_sr(cached_irq_mask, intenable);
+}
+
+static void xtensa_irq_enable(struct irq_data *d)
+{
+        variant_irq_enable(d->hwirq);
+        xtensa_irq_unmask(d);
+}
+
+static void xtensa_irq_disable(struct irq_data *d)
+{
+        xtensa_irq_mask(d);
+        variant_irq_disable(d->hwirq);
+}
+
+static void xtensa_irq_ack(struct irq_data *d)
+{
+        set_sr(1 << d->hwirq, intclear);
+}
+
+static int xtensa_irq_retrigger(struct irq_data *d)
+{
+        set_sr(1 << d->hwirq, intset);
+        return 1;
+}
+
+static struct irq_chip xtensa_irq_chip = {
+        .name           = "xtensa",
+        .irq_enable     = xtensa_irq_enable,
+        .irq_disable    = xtensa_irq_disable,
+        .irq_mask       = xtensa_irq_mask,
+        .irq_unmask     = xtensa_irq_unmask,
+        .irq_ack        = xtensa_irq_ack,
+        .irq_retrigger  = xtensa_irq_retrigger,
+};
+
+int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent)
+{
+        struct irq_domain *root_domain =
+                irq_domain_add_legacy(NULL, NR_IRQS, 0, 0,
+                                &xtensa_irq_domain_ops, &xtensa_irq_chip);
+        irq_set_default_host(root_domain);
+        return 0;
+}
+
+static int __init xtensa_pic_init(struct device_node *np,
+                struct device_node *interrupt_parent)
+{
+        struct irq_domain *root_domain =
+                irq_domain_add_linear(np, NR_IRQS, &xtensa_irq_domain_ops,
+                                &xtensa_irq_chip);
+        irq_set_default_host(root_domain);
+        return 0;
+}
+IRQCHIP_DECLARE(xtensa_irq_chip, "cdns,xtensa-pic", xtensa_pic_init);