Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
[cascardo/linux.git] / drivers / irqchip / irq-mips-gic.c
index 633a346..2b0468e 100644 (file)
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
 #include <linux/bitmap.h>
+#include <linux/clocksource.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqchip/mips-gic.h>
+#include <linux/of_address.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
-#include <linux/irq.h>
-#include <linux/clocksource.h>
 
-#include <asm/io.h>
-#include <asm/gic.h>
+#include <asm/mips-cm.h>
 #include <asm/setup.h>
 #include <asm/traps.h>
-#include <linux/hardirq.h>
-#include <asm-generic/bitops/find.h>
 
-unsigned int gic_frequency;
-unsigned int gic_present;
-unsigned long _gic_base;
-unsigned int gic_irq_flags[GIC_NUM_INTRS];
-unsigned int gic_cpu_pin;
+#include <dt-bindings/interrupt-controller/mips-gic.h>
 
-struct gic_pcpu_mask {
-       DECLARE_BITMAP(pcpu_mask, GIC_NUM_INTRS);
-};
+#include "irqchip.h"
 
-struct gic_pending_regs {
-       DECLARE_BITMAP(pending, GIC_NUM_INTRS);
-};
+unsigned int gic_present;
 
-struct gic_intrmask_regs {
-       DECLARE_BITMAP(intrmask, GIC_NUM_INTRS);
+struct gic_pcpu_mask {
+       DECLARE_BITMAP(pcpu_mask, GIC_MAX_INTRS);
 };
 
+static void __iomem *gic_base;
 static struct gic_pcpu_mask pcpu_masks[NR_CPUS];
-static struct gic_pending_regs pending_regs[NR_CPUS];
-static struct gic_intrmask_regs intrmask_regs[NR_CPUS];
 static DEFINE_SPINLOCK(gic_lock);
 static struct irq_domain *gic_irq_domain;
+static int gic_shared_intrs;
+static int gic_vpes;
+static unsigned int gic_cpu_pin;
+static struct irq_chip gic_level_irq_controller, gic_edge_irq_controller;
 
 static void __gic_irq_dispatch(void);
 
-#if defined(CONFIG_CSRC_GIC) || defined(CONFIG_CEVT_GIC)
+static inline unsigned int gic_read(unsigned int reg)
+{
+       return __raw_readl(gic_base + reg);
+}
+
+static inline void gic_write(unsigned int reg, unsigned int val)
+{
+       __raw_writel(val, gic_base + reg);
+}
+
+static inline void gic_update_bits(unsigned int reg, unsigned int mask,
+                                  unsigned int val)
+{
+       unsigned int regval;
+
+       regval = gic_read(reg);
+       regval &= ~mask;
+       regval |= val;
+       gic_write(reg, regval);
+}
+
+static inline void gic_reset_mask(unsigned int intr)
+{
+       gic_write(GIC_REG(SHARED, GIC_SH_RMASK) + GIC_INTR_OFS(intr),
+                 1 << GIC_INTR_BIT(intr));
+}
+
+static inline void gic_set_mask(unsigned int intr)
+{
+       gic_write(GIC_REG(SHARED, GIC_SH_SMASK) + GIC_INTR_OFS(intr),
+                 1 << GIC_INTR_BIT(intr));
+}
+
+static inline void gic_set_polarity(unsigned int intr, unsigned int pol)
+{
+       gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_POLARITY) +
+                       GIC_INTR_OFS(intr), 1 << GIC_INTR_BIT(intr),
+                       pol << GIC_INTR_BIT(intr));
+}
+
+static inline void gic_set_trigger(unsigned int intr, unsigned int trig)
+{
+       gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_TRIGGER) +
+                       GIC_INTR_OFS(intr), 1 << GIC_INTR_BIT(intr),
+                       trig << GIC_INTR_BIT(intr));
+}
+
+static inline void gic_set_dual_edge(unsigned int intr, unsigned int dual)
+{
+       gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_DUAL) + GIC_INTR_OFS(intr),
+                       1 << GIC_INTR_BIT(intr),
+                       dual << GIC_INTR_BIT(intr));
+}
+
+static inline void gic_map_to_pin(unsigned int intr, unsigned int pin)
+{
+       gic_write(GIC_REG(SHARED, GIC_SH_INTR_MAP_TO_PIN_BASE) +
+                 GIC_SH_MAP_TO_PIN(intr), GIC_MAP_TO_PIN_MSK | pin);
+}
+
+static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe)
+{
+       gic_write(GIC_REG(SHARED, GIC_SH_INTR_MAP_TO_VPE_BASE) +
+                 GIC_SH_MAP_TO_VPE_REG_OFF(intr, vpe),
+                 GIC_SH_MAP_TO_VPE_REG_BIT(vpe));
+}
+
+#ifdef CONFIG_CLKSRC_MIPS_GIC
 cycle_t gic_read_count(void)
 {
        unsigned int hi, hi2, lo;
 
        do {
-               GICREAD(GIC_REG(SHARED, GIC_SH_COUNTER_63_32), hi);
-               GICREAD(GIC_REG(SHARED, GIC_SH_COUNTER_31_00), lo);
-               GICREAD(GIC_REG(SHARED, GIC_SH_COUNTER_63_32), hi2);
+               hi = gic_read(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
+               lo = gic_read(GIC_REG(SHARED, GIC_SH_COUNTER_31_00));
+               hi2 = gic_read(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
        } while (hi2 != hi);
 
        return (((cycle_t) hi) << 32) + lo;
 }
 
+unsigned int gic_get_count_width(void)
+{
+       unsigned int bits, config;
+
+       config = gic_read(GIC_REG(SHARED, GIC_SH_CONFIG));
+       bits = 32 + 4 * ((config & GIC_SH_CONFIG_COUNTBITS_MSK) >>
+                        GIC_SH_CONFIG_COUNTBITS_SHF);
+
+       return bits;
+}
+
 void gic_write_compare(cycle_t cnt)
 {
-       GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI),
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI),
                                (int)(cnt >> 32));
-       GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO),
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO),
                                (int)(cnt & 0xffffffff));
 }
 
@@ -75,10 +147,10 @@ void gic_write_cpu_compare(cycle_t cnt, int cpu)
 
        local_irq_save(flags);
 
-       GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), cpu);
-       GICWRITE(GIC_REG(VPE_OTHER, GIC_VPE_COMPARE_HI),
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), cpu);
+       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_COMPARE_HI),
                                (int)(cnt >> 32));
-       GICWRITE(GIC_REG(VPE_OTHER, GIC_VPE_COMPARE_LO),
+       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_COMPARE_LO),
                                (int)(cnt & 0xffffffff));
 
        local_irq_restore(flags);
@@ -88,198 +160,173 @@ cycle_t gic_read_compare(void)
 {
        unsigned int hi, lo;
 
-       GICREAD(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI), hi);
-       GICREAD(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO), lo);
+       hi = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI));
+       lo = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO));
 
        return (((cycle_t) hi) << 32) + lo;
 }
 #endif
 
+static bool gic_local_irq_is_routable(int intr)
+{
+       u32 vpe_ctl;
+
+       /* All local interrupts are routable in EIC mode. */
+       if (cpu_has_veic)
+               return true;
+
+       vpe_ctl = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_CTL));
+       switch (intr) {
+       case GIC_LOCAL_INT_TIMER:
+               return vpe_ctl & GIC_VPE_CTL_TIMER_RTBL_MSK;
+       case GIC_LOCAL_INT_PERFCTR:
+               return vpe_ctl & GIC_VPE_CTL_PERFCNT_RTBL_MSK;
+       case GIC_LOCAL_INT_FDC:
+               return vpe_ctl & GIC_VPE_CTL_FDC_RTBL_MSK;
+       case GIC_LOCAL_INT_SWINT0:
+       case GIC_LOCAL_INT_SWINT1:
+               return vpe_ctl & GIC_VPE_CTL_SWINT_RTBL_MSK;
+       default:
+               return true;
+       }
+}
+
 unsigned int gic_get_timer_pending(void)
 {
        unsigned int vpe_pending;
 
-       GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), 0);
-       GICREAD(GIC_REG(VPE_OTHER, GIC_VPE_PEND), vpe_pending);
+       vpe_pending = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_PEND));
        return vpe_pending & GIC_VPE_PEND_TIMER_MSK;
 }
 
-void gic_bind_eic_interrupt(int irq, int set)
+static void gic_bind_eic_interrupt(int irq, int set)
 {
        /* Convert irq vector # to hw int # */
        irq -= GIC_PIN_TO_VEC_OFFSET;
 
        /* Set irq to use shadow set */
-       GICWRITE(GIC_REG_ADDR(VPE_LOCAL, GIC_VPE_EIC_SS(irq)), set);
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_EIC_SHADOW_SET_BASE) +
+                 GIC_VPE_EIC_SS(irq), set);
 }
 
 void gic_send_ipi(unsigned int intr)
 {
-       GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), 0x80000000 | intr);
+       gic_write(GIC_REG(SHARED, GIC_SH_WEDGE), GIC_SH_WEDGE_SET(intr));
 }
 
-static void __init vpe_local_setup(unsigned int numvpes)
+int gic_get_c0_compare_int(void)
 {
-       unsigned long timer_intr = GIC_INT_TMR;
-       unsigned long perf_intr = GIC_INT_PERFCTR;
-       unsigned int vpe_ctl;
-       int i;
-
-       if (cpu_has_veic) {
-               /*
-                * GIC timer interrupt -> CPU HW Int X (vector X+2) ->
-                * map to pin X+2-1 (since GIC adds 1)
-                */
-               timer_intr += (GIC_CPU_TO_VEC_OFFSET - GIC_PIN_TO_VEC_OFFSET);
-               /*
-                * GIC perfcnt interrupt -> CPU HW Int X (vector X+2) ->
-                * map to pin X+2-1 (since GIC adds 1)
-                */
-               perf_intr += (GIC_CPU_TO_VEC_OFFSET - GIC_PIN_TO_VEC_OFFSET);
-       }
-
-       /*
-        * Setup the default performance counter timer interrupts
-        * for all VPEs
-        */
-       for (i = 0; i < numvpes; i++) {
-               GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), i);
-
-               /* Are Interrupts locally routable? */
-               GICREAD(GIC_REG(VPE_OTHER, GIC_VPE_CTL), vpe_ctl);
-               if (vpe_ctl & GIC_VPE_CTL_TIMER_RTBL_MSK)
-                       GICWRITE(GIC_REG(VPE_OTHER, GIC_VPE_TIMER_MAP),
-                                GIC_MAP_TO_PIN_MSK | timer_intr);
-               if (cpu_has_veic) {
-                       set_vi_handler(timer_intr + GIC_PIN_TO_VEC_OFFSET,
-                                      __gic_irq_dispatch);
-               }
-
-               if (vpe_ctl & GIC_VPE_CTL_PERFCNT_RTBL_MSK)
-                       GICWRITE(GIC_REG(VPE_OTHER, GIC_VPE_PERFCTR_MAP),
-                                GIC_MAP_TO_PIN_MSK | perf_intr);
-               if (cpu_has_veic) {
-                       set_vi_handler(perf_intr + GIC_PIN_TO_VEC_OFFSET,
-                                      __gic_irq_dispatch);
-               }
-       }
+       if (!gic_local_irq_is_routable(GIC_LOCAL_INT_TIMER))
+               return MIPS_CPU_IRQ_BASE + cp0_compare_irq;
+       return irq_create_mapping(gic_irq_domain,
+                                 GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_TIMER));
 }
 
-unsigned int gic_compare_int(void)
+int gic_get_c0_perfcount_int(void)
 {
-       unsigned int pending;
-
-       GICREAD(GIC_REG(VPE_LOCAL, GIC_VPE_PEND), pending);
-       if (pending & GIC_VPE_PEND_CMP_MSK)
-               return 1;
-       else
-               return 0;
+       if (!gic_local_irq_is_routable(GIC_LOCAL_INT_PERFCTR)) {
+               /* Is the erformance counter shared with the timer? */
+               if (cp0_perfcount_irq < 0)
+                       return -1;
+               return MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
+       }
+       return irq_create_mapping(gic_irq_domain,
+                                 GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_PERFCTR));
 }
 
-void gic_get_int_mask(unsigned long *dst, const unsigned long *src)
+static unsigned int gic_get_int(void)
 {
        unsigned int i;
-       unsigned long *pending, *intrmask, *pcpu_mask;
-       unsigned long *pending_abs, *intrmask_abs;
+       unsigned long *pcpu_mask;
+       unsigned long pending_reg, intrmask_reg;
+       DECLARE_BITMAP(pending, GIC_MAX_INTRS);
+       DECLARE_BITMAP(intrmask, GIC_MAX_INTRS);
 
        /* Get per-cpu bitmaps */
-       pending = pending_regs[smp_processor_id()].pending;
-       intrmask = intrmask_regs[smp_processor_id()].intrmask;
        pcpu_mask = pcpu_masks[smp_processor_id()].pcpu_mask;
 
-       pending_abs = (unsigned long *) GIC_REG_ABS_ADDR(SHARED,
-                                                        GIC_SH_PEND_31_0_OFS);
-       intrmask_abs = (unsigned long *) GIC_REG_ABS_ADDR(SHARED,
-                                                         GIC_SH_MASK_31_0_OFS);
+       pending_reg = GIC_REG(SHARED, GIC_SH_PEND);
+       intrmask_reg = GIC_REG(SHARED, GIC_SH_MASK);
 
-       for (i = 0; i < BITS_TO_LONGS(GIC_NUM_INTRS); i++) {
-               GICREAD(*pending_abs, pending[i]);
-               GICREAD(*intrmask_abs, intrmask[i]);
-               pending_abs++;
-               intrmask_abs++;
+       for (i = 0; i < BITS_TO_LONGS(gic_shared_intrs); i++) {
+               pending[i] = gic_read(pending_reg);
+               intrmask[i] = gic_read(intrmask_reg);
+               pending_reg += 0x4;
+               intrmask_reg += 0x4;
        }
 
-       bitmap_and(pending, pending, intrmask, GIC_NUM_INTRS);
-       bitmap_and(pending, pending, pcpu_mask, GIC_NUM_INTRS);
-       bitmap_and(dst, src, pending, GIC_NUM_INTRS);
-}
-
-unsigned int gic_get_int(void)
-{
-       DECLARE_BITMAP(interrupts, GIC_NUM_INTRS);
-
-       bitmap_fill(interrupts, GIC_NUM_INTRS);
-       gic_get_int_mask(interrupts, interrupts);
+       bitmap_and(pending, pending, intrmask, gic_shared_intrs);
+       bitmap_and(pending, pending, pcpu_mask, gic_shared_intrs);
 
-       return find_first_bit(interrupts, GIC_NUM_INTRS);
+       return find_first_bit(pending, gic_shared_intrs);
 }
 
 static void gic_mask_irq(struct irq_data *d)
 {
-       GIC_CLR_INTR_MASK(d->hwirq);
+       gic_reset_mask(GIC_HWIRQ_TO_SHARED(d->hwirq));
 }
 
 static void gic_unmask_irq(struct irq_data *d)
 {
-       GIC_SET_INTR_MASK(d->hwirq);
+       gic_set_mask(GIC_HWIRQ_TO_SHARED(d->hwirq));
 }
 
 static void gic_ack_irq(struct irq_data *d)
 {
-       unsigned int irq = d->hwirq;
+       unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);
 
-       /* Clear edge detector */
-       if (gic_irq_flags[irq] & GIC_TRIG_EDGE)
-               GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), irq);
+       gic_write(GIC_REG(SHARED, GIC_SH_WEDGE), GIC_SH_WEDGE_CLR(irq));
 }
 
 static int gic_set_type(struct irq_data *d, unsigned int type)
 {
-       unsigned int irq = d->hwirq;
+       unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);
        unsigned long flags;
        bool is_edge;
 
        spin_lock_irqsave(&gic_lock, flags);
        switch (type & IRQ_TYPE_SENSE_MASK) {
        case IRQ_TYPE_EDGE_FALLING:
-               GIC_SET_POLARITY(irq, GIC_POL_NEG);
-               GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
-               GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
+               gic_set_polarity(irq, GIC_POL_NEG);
+               gic_set_trigger(irq, GIC_TRIG_EDGE);
+               gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
                is_edge = true;
                break;
        case IRQ_TYPE_EDGE_RISING:
-               GIC_SET_POLARITY(irq, GIC_POL_POS);
-               GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
-               GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
+               gic_set_polarity(irq, GIC_POL_POS);
+               gic_set_trigger(irq, GIC_TRIG_EDGE);
+               gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
                is_edge = true;
                break;
        case IRQ_TYPE_EDGE_BOTH:
                /* polarity is irrelevant in this case */
-               GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
-               GIC_SET_DUAL(irq, GIC_TRIG_DUAL_ENABLE);
+               gic_set_trigger(irq, GIC_TRIG_EDGE);
+               gic_set_dual_edge(irq, GIC_TRIG_DUAL_ENABLE);
                is_edge = true;
                break;
        case IRQ_TYPE_LEVEL_LOW:
-               GIC_SET_POLARITY(irq, GIC_POL_NEG);
-               GIC_SET_TRIGGER(irq, GIC_TRIG_LEVEL);
-               GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
+               gic_set_polarity(irq, GIC_POL_NEG);
+               gic_set_trigger(irq, GIC_TRIG_LEVEL);
+               gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
                is_edge = false;
                break;
        case IRQ_TYPE_LEVEL_HIGH:
        default:
-               GIC_SET_POLARITY(irq, GIC_POL_POS);
-               GIC_SET_TRIGGER(irq, GIC_TRIG_LEVEL);
-               GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
+               gic_set_polarity(irq, GIC_POL_POS);
+               gic_set_trigger(irq, GIC_TRIG_LEVEL);
+               gic_set_dual_edge(irq, GIC_TRIG_DUAL_DISABLE);
                is_edge = false;
                break;
        }
 
        if (is_edge) {
-               gic_irq_flags[irq] |= GIC_TRIG_EDGE;
-               __irq_set_handler_locked(d->irq, handle_edge_irq);
+               __irq_set_chip_handler_name_locked(d->irq,
+                                                  &gic_edge_irq_controller,
+                                                  handle_edge_irq, NULL);
        } else {
-               gic_irq_flags[irq] &= ~GIC_TRIG_EDGE;
-               __irq_set_handler_locked(d->irq, handle_level_irq);
+               __irq_set_chip_handler_name_locked(d->irq,
+                                                  &gic_level_irq_controller,
+                                                  handle_level_irq, NULL);
        }
        spin_unlock_irqrestore(&gic_lock, flags);
 
@@ -290,7 +337,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
 static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
                            bool force)
 {
-       unsigned int irq = d->hwirq;
+       unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);
        cpumask_t       tmp = CPU_MASK_NONE;
        unsigned long   flags;
        int             i;
@@ -303,7 +350,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
        spin_lock_irqsave(&gic_lock, flags);
 
        /* Re-route this IRQ */
-       GIC_SH_MAP_TO_VPE_SMASK(irq, first_cpu(tmp));
+       gic_map_to_vpe(irq, first_cpu(tmp));
 
        /* Update the pcpu_masks */
        for (i = 0; i < NR_CPUS; i++)
@@ -317,7 +364,17 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
 }
 #endif
 
-static struct irq_chip gic_irq_controller = {
+static struct irq_chip gic_level_irq_controller = {
+       .name                   =       "MIPS GIC",
+       .irq_mask               =       gic_mask_irq,
+       .irq_unmask             =       gic_unmask_irq,
+       .irq_set_type           =       gic_set_type,
+#ifdef CONFIG_SMP
+       .irq_set_affinity       =       gic_set_affinity,
+#endif
+};
+
+static struct irq_chip gic_edge_irq_controller = {
        .name                   =       "MIPS GIC",
        .irq_ack                =       gic_ack_irq,
        .irq_mask               =       gic_mask_irq,
@@ -328,12 +385,85 @@ static struct irq_chip gic_irq_controller = {
 #endif
 };
 
+static unsigned int gic_get_local_int(void)
+{
+       unsigned long pending, masked;
+
+       pending = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_PEND));
+       masked = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_MASK));
+
+       bitmap_and(&pending, &pending, &masked, GIC_NUM_LOCAL_INTRS);
+
+       return find_first_bit(&pending, GIC_NUM_LOCAL_INTRS);
+}
+
+static void gic_mask_local_irq(struct irq_data *d)
+{
+       int intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
+
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_RMASK), 1 << intr);
+}
+
+static void gic_unmask_local_irq(struct irq_data *d)
+{
+       int intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
+
+       gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_SMASK), 1 << intr);
+}
+
+static struct irq_chip gic_local_irq_controller = {
+       .name                   =       "MIPS GIC Local",
+       .irq_mask               =       gic_mask_local_irq,
+       .irq_unmask             =       gic_unmask_local_irq,
+};
+
+static void gic_mask_local_irq_all_vpes(struct irq_data *d)
+{
+       int intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
+       int i;
+       unsigned long flags;
+
+       spin_lock_irqsave(&gic_lock, flags);
+       for (i = 0; i < gic_vpes; i++) {
+               gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), i);
+               gic_write(GIC_REG(VPE_OTHER, GIC_VPE_RMASK), 1 << intr);
+       }
+       spin_unlock_irqrestore(&gic_lock, flags);
+}
+
+static void gic_unmask_local_irq_all_vpes(struct irq_data *d)
+{
+       int intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);
+       int i;
+       unsigned long flags;
+
+       spin_lock_irqsave(&gic_lock, flags);
+       for (i = 0; i < gic_vpes; i++) {
+               gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), i);
+               gic_write(GIC_REG(VPE_OTHER, GIC_VPE_SMASK), 1 << intr);
+       }
+       spin_unlock_irqrestore(&gic_lock, flags);
+}
+
+static struct irq_chip gic_all_vpes_local_irq_controller = {
+       .name                   =       "MIPS GIC Local",
+       .irq_mask               =       gic_mask_local_irq_all_vpes,
+       .irq_unmask             =       gic_unmask_local_irq_all_vpes,
+};
+
 static void __gic_irq_dispatch(void)
 {
        unsigned int intr, virq;
 
-       while ((intr = gic_get_int()) != GIC_NUM_INTRS) {
-               virq = irq_linear_revmap(gic_irq_domain, intr);
+       while ((intr = gic_get_local_int()) != GIC_NUM_LOCAL_INTRS) {
+               virq = irq_linear_revmap(gic_irq_domain,
+                                        GIC_LOCAL_TO_HWIRQ(intr));
+               do_IRQ(virq);
+       }
+
+       while ((intr = gic_get_int()) != gic_shared_intrs) {
+               virq = irq_linear_revmap(gic_irq_domain,
+                                        GIC_SHARED_TO_HWIRQ(intr));
                do_IRQ(virq);
        }
 }
@@ -386,10 +516,11 @@ static struct irqaction irq_call = {
 static __init void gic_ipi_init_one(unsigned int intr, int cpu,
                                    struct irqaction *action)
 {
-       int virq = irq_create_mapping(gic_irq_domain, intr);
+       int virq = irq_create_mapping(gic_irq_domain,
+                                     GIC_SHARED_TO_HWIRQ(intr));
        int i;
 
-       GIC_SH_MAP_TO_VPE_SMASK(intr, cpu);
+       gic_map_to_vpe(intr, cpu);
        for (i = 0; i < NR_CPUS; i++)
                clear_bit(intr, pcpu_masks[i].pcpu_mask);
        set_bit(intr, pcpu_masks[cpu].pcpu_mask);
@@ -405,7 +536,7 @@ static __init void gic_ipi_init(void)
        int i;
 
        /* Use last 2 * NR_CPUS interrupts as IPIs */
-       gic_resched_int_base = GIC_NUM_INTRS - nr_cpu_ids;
+       gic_resched_int_base = gic_shared_intrs - nr_cpu_ids;
        gic_call_int_base = gic_resched_int_base - nr_cpu_ids;
 
        for (i = 0; i < nr_cpu_ids; i++) {
@@ -419,65 +550,165 @@ static inline void gic_ipi_init(void)
 }
 #endif
 
-static void __init gic_basic_init(int numintrs, int numvpes)
+static void __init gic_basic_init(void)
 {
        unsigned int i;
 
        board_bind_eic_interrupt = &gic_bind_eic_interrupt;
 
        /* Setup defaults */
-       for (i = 0; i < numintrs; i++) {
-               GIC_SET_POLARITY(i, GIC_POL_POS);
-               GIC_SET_TRIGGER(i, GIC_TRIG_LEVEL);
-               GIC_CLR_INTR_MASK(i);
-               if (i < GIC_NUM_INTRS)
-                       gic_irq_flags[i] = 0;
+       for (i = 0; i < gic_shared_intrs; i++) {
+               gic_set_polarity(i, GIC_POL_POS);
+               gic_set_trigger(i, GIC_TRIG_LEVEL);
+               gic_reset_mask(i);
        }
 
-       vpe_local_setup(numvpes);
+       for (i = 0; i < gic_vpes; i++) {
+               unsigned int j;
+
+               gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), i);
+               for (j = 0; j < GIC_NUM_LOCAL_INTRS; j++) {
+                       if (!gic_local_irq_is_routable(j))
+                               continue;
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_RMASK), 1 << j);
+               }
+       }
 }
 
-static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq,
-                             irq_hw_number_t hw)
+static int gic_local_irq_domain_map(struct irq_domain *d, unsigned int virq,
+                                   irq_hw_number_t hw)
+{
+       int intr = GIC_HWIRQ_TO_LOCAL(hw);
+       int ret = 0;
+       int i;
+       unsigned long flags;
+
+       if (!gic_local_irq_is_routable(intr))
+               return -EPERM;
+
+       /*
+        * HACK: These are all really percpu interrupts, but the rest
+        * of the MIPS kernel code does not use the percpu IRQ API for
+        * the CP0 timer and performance counter interrupts.
+        */
+       if (intr != GIC_LOCAL_INT_TIMER && intr != GIC_LOCAL_INT_PERFCTR) {
+               irq_set_chip_and_handler(virq,
+                                        &gic_local_irq_controller,
+                                        handle_percpu_devid_irq);
+               irq_set_percpu_devid(virq);
+       } else {
+               irq_set_chip_and_handler(virq,
+                                        &gic_all_vpes_local_irq_controller,
+                                        handle_percpu_irq);
+       }
+
+       spin_lock_irqsave(&gic_lock, flags);
+       for (i = 0; i < gic_vpes; i++) {
+               u32 val = GIC_MAP_TO_PIN_MSK | gic_cpu_pin;
+
+               gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_OTHER_ADDR), i);
+
+               switch (intr) {
+               case GIC_LOCAL_INT_WD:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_WD_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_COMPARE:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_COMPARE_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_TIMER:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_TIMER_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_PERFCTR:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_PERFCTR_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_SWINT0:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_SWINT0_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_SWINT1:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_SWINT1_MAP), val);
+                       break;
+               case GIC_LOCAL_INT_FDC:
+                       gic_write(GIC_REG(VPE_OTHER, GIC_VPE_FDC_MAP), val);
+                       break;
+               default:
+                       pr_err("Invalid local IRQ %d\n", intr);
+                       ret = -EINVAL;
+                       break;
+               }
+       }
+       spin_unlock_irqrestore(&gic_lock, flags);
+
+       return ret;
+}
+
+static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq,
+                                    irq_hw_number_t hw)
 {
+       int intr = GIC_HWIRQ_TO_SHARED(hw);
        unsigned long flags;
 
-       irq_set_chip_and_handler(virq, &gic_irq_controller, handle_level_irq);
+       irq_set_chip_and_handler(virq, &gic_level_irq_controller,
+                                handle_level_irq);
 
        spin_lock_irqsave(&gic_lock, flags);
-       GICWRITE(GIC_REG_ADDR(SHARED, GIC_SH_MAP_TO_PIN(hw)),
-                GIC_MAP_TO_PIN_MSK | gic_cpu_pin);
+       gic_map_to_pin(intr, gic_cpu_pin);
        /* Map to VPE 0 by default */
-       GIC_SH_MAP_TO_VPE_SMASK(hw, 0);
-       set_bit(hw, pcpu_masks[0].pcpu_mask);
+       gic_map_to_vpe(intr, 0);
+       set_bit(intr, pcpu_masks[0].pcpu_mask);
        spin_unlock_irqrestore(&gic_lock, flags);
 
        return 0;
 }
 
+static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq,
+                             irq_hw_number_t hw)
+{
+       if (GIC_HWIRQ_TO_LOCAL(hw) < GIC_NUM_LOCAL_INTRS)
+               return gic_local_irq_domain_map(d, virq, hw);
+       return gic_shared_irq_domain_map(d, virq, hw);
+}
+
+static int gic_irq_domain_xlate(struct irq_domain *d, struct device_node *ctrlr,
+                               const u32 *intspec, unsigned int intsize,
+                               irq_hw_number_t *out_hwirq,
+                               unsigned int *out_type)
+{
+       if (intsize != 3)
+               return -EINVAL;
+
+       if (intspec[0] == GIC_SHARED)
+               *out_hwirq = GIC_SHARED_TO_HWIRQ(intspec[1]);
+       else if (intspec[0] == GIC_LOCAL)
+               *out_hwirq = GIC_LOCAL_TO_HWIRQ(intspec[1]);
+       else
+               return -EINVAL;
+       *out_type = intspec[2] & IRQ_TYPE_SENSE_MASK;
+
+       return 0;
+}
+
 static struct irq_domain_ops gic_irq_domain_ops = {
        .map = gic_irq_domain_map,
-       .xlate = irq_domain_xlate_twocell,
+       .xlate = gic_irq_domain_xlate,
 };
 
-void __init gic_init(unsigned long gic_base_addr,
-                    unsigned long gic_addrspace_size, unsigned int cpu_vec,
-                    unsigned int irqbase)
+static void __init __gic_init(unsigned long gic_base_addr,
+                             unsigned long gic_addrspace_size,
+                             unsigned int cpu_vec, unsigned int irqbase,
+                             struct device_node *node)
 {
        unsigned int gicconfig;
-       int numvpes, numintrs;
 
-       _gic_base = (unsigned long) ioremap_nocache(gic_base_addr,
-                                                   gic_addrspace_size);
+       gic_base = ioremap_nocache(gic_base_addr, gic_addrspace_size);
 
-       GICREAD(GIC_REG(SHARED, GIC_SH_CONFIG), gicconfig);
-       numintrs = (gicconfig & GIC_SH_CONFIG_NUMINTRS_MSK) >>
+       gicconfig = gic_read(GIC_REG(SHARED, GIC_SH_CONFIG));
+       gic_shared_intrs = (gicconfig & GIC_SH_CONFIG_NUMINTRS_MSK) >>
                   GIC_SH_CONFIG_NUMINTRS_SHF;
-       numintrs = ((numintrs + 1) * 8);
+       gic_shared_intrs = ((gic_shared_intrs + 1) * 8);
 
-       numvpes = (gicconfig & GIC_SH_CONFIG_NUMVPES_MSK) >>
+       gic_vpes = (gicconfig & GIC_SH_CONFIG_NUMVPES_MSK) >>
                  GIC_SH_CONFIG_NUMVPES_SHF;
-       numvpes = numvpes + 1;
+       gic_vpes = gic_vpes + 1;
 
        if (cpu_has_veic) {
                /* Always use vector 1 in EIC mode */
@@ -490,12 +721,69 @@ void __init gic_init(unsigned long gic_base_addr,
                                        gic_irq_dispatch);
        }
 
-       gic_irq_domain = irq_domain_add_simple(NULL, GIC_NUM_INTRS, irqbase,
+       gic_irq_domain = irq_domain_add_simple(node, GIC_NUM_LOCAL_INTRS +
+                                              gic_shared_intrs, irqbase,
                                               &gic_irq_domain_ops, NULL);
        if (!gic_irq_domain)
                panic("Failed to add GIC IRQ domain");
 
-       gic_basic_init(numintrs, numvpes);
+       gic_basic_init();
 
        gic_ipi_init();
 }
+
+void __init gic_init(unsigned long gic_base_addr,
+                    unsigned long gic_addrspace_size,
+                    unsigned int cpu_vec, unsigned int irqbase)
+{
+       __gic_init(gic_base_addr, gic_addrspace_size, cpu_vec, irqbase, NULL);
+}
+
+static int __init gic_of_init(struct device_node *node,
+                             struct device_node *parent)
+{
+       struct resource res;
+       unsigned int cpu_vec, i = 0, reserved = 0;
+       phys_addr_t gic_base;
+       size_t gic_len;
+
+       /* Find the first available CPU vector. */
+       while (!of_property_read_u32_index(node, "mti,reserved-cpu-vectors",
+                                          i++, &cpu_vec))
+               reserved |= BIT(cpu_vec);
+       for (cpu_vec = 2; cpu_vec < 8; cpu_vec++) {
+               if (!(reserved & BIT(cpu_vec)))
+                       break;
+       }
+       if (cpu_vec == 8) {
+               pr_err("No CPU vectors available for GIC\n");
+               return -ENODEV;
+       }
+
+       if (of_address_to_resource(node, 0, &res)) {
+               /*
+                * Probe the CM for the GIC base address if not specified
+                * in the device-tree.
+                */
+               if (mips_cm_present()) {
+                       gic_base = read_gcr_gic_base() &
+                               ~CM_GCR_GIC_BASE_GICEN_MSK;
+                       gic_len = 0x20000;
+               } else {
+                       pr_err("Failed to get GIC memory range\n");
+                       return -ENODEV;
+               }
+       } else {
+               gic_base = res.start;
+               gic_len = resource_size(&res);
+       }
+
+       if (mips_cm_present())
+               write_gcr_gic_base(gic_base | CM_GCR_GIC_BASE_GICEN_MSK);
+       gic_present = true;
+
+       __gic_init(gic_base, gic_len, cpu_vec, 0, node);
+
+       return 0;
+}
+IRQCHIP_DECLARE(mips_gic, "mti,gic", gic_of_init);