sh: rework intc2 code

The shared intc2 code currently contains cpu-specific #ifdefs.
This is a tad unclean and it prevents us from using the shared code
to drive board-specific irqs on the se7780 board.

This patch reworks the intc2 code by moving the base addresses of
the intc2 registers into struct intc2_desc. This new structure also
contains the name of the controller in struct irq_chip. The idea
behind putting struct irq_chip in there is that we can use offsetof()
to locate the base addresses in the irq_chip callbacks.

One logic change has been made - the original shared intc2 code
enabled the interrupts by default but with this patch they are all
disabled by default.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 70 insertions, 34 deletions

diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index d8e22f4ff0f0..dae02d3152e7 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -14,36 +14,26 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7760)
-#define INTC2_BASE      0xfe080000
-#define INTC2_INTMSK    (INTC2_BASE + 0x40)
-#define INTC2_INTMSKCLR (INTC2_BASE + 0x60)
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7785)
-#define INTC2_BASE      0xffd40000
-#define INTC2_INTMSK    (INTC2_BASE + 0x38)
-#define INTC2_INTMSKCLR (INTC2_BASE + 0x3c)
-#endif
+static inline struct intc2_desc *get_intc2_desc(unsigned int irq)
+{
+        struct irq_chip *chip = get_irq_chip(irq);
+        return (void *)((char *)chip - offsetof(struct intc2_desc, chip));
+}
 
 static void disable_intc2_irq(unsigned int irq)
 {
         struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC2_INTMSK + p->msk_offset);
+        struct intc2_desc *d = get_intc2_desc(irq);
+        ctrl_outl(1 << p->msk_shift, d->msk_base + p->msk_offset);
 }
 
 static void enable_intc2_irq(unsigned int irq)
 {
         struct intc2_data *p = get_irq_chip_data(irq);
-        ctrl_outl(1 << p->msk_shift, INTC2_INTMSKCLR + p->msk_offset);
+        struct intc2_desc *d = get_intc2_desc(irq);
+        ctrl_outl(1 << p->msk_shift, d->mskclr_base + p->msk_offset);
 }
 
-static struct irq_chip intc2_irq_chip = {
-        .name           = "INTC2",
-        .mask           = disable_intc2_irq,
-        .unmask         = enable_intc2_irq,
-        .mask_ack       = disable_intc2_irq,
-};
-
 /*
  * Setup an INTC2 style interrupt.
  * NOTE: Unlike IPR interrupts, parameters are not shifted by this code,
@@ -56,30 +46,36 @@ static struct irq_chip intc2_irq_chip = {
  *
  * in the intc2_data table.
  */
-void make_intc2_irq(struct intc2_data *table, unsigned int nr_irqs)
+void register_intc2_controller(struct intc2_desc *desc)
 {
         int i;
 
-        for (i = 0; i < nr_irqs; i++) {
+        desc->chip.mask = disable_intc2_irq;
+        desc->chip.unmask = enable_intc2_irq;
+        desc->chip.mask_ack = disable_intc2_irq;
+
+        for (i = 0; i < desc->nr_irqs; i++) {
                 unsigned long ipr, flags;
-                struct intc2_data *p = table + i;
+                struct intc2_data *p = desc->intc2_data + i;
 
                 disable_irq_nosync(p->irq);
 
-                /* Set the priority level */
-                local_irq_save(flags);
+                if (desc->prio_base) {
+                        /* Set the priority level */
+                        local_irq_save(flags);
 
-                ipr = ctrl_inl(INTC2_BASE + p->ipr_offset);
-                ipr &= ~(0xf << p->ipr_shift);
-                ipr |= p->priority << p->ipr_shift;
-                ctrl_outl(ipr, INTC2_BASE + p->ipr_offset);
+                        ipr = ctrl_inl(desc->prio_base + p->ipr_offset);
+                        ipr &= ~(0xf << p->ipr_shift);
+                        ipr |= p->priority << p->ipr_shift;
+                        ctrl_outl(ipr, desc->prio_base + p->ipr_offset);
 
-                local_irq_restore(flags);
+                        local_irq_restore(flags);
+                }
 
-                set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,
+                set_irq_chip_and_handler_name(p->irq, &desc->chip,
                                               handle_level_irq, "level");
                 set_irq_chip_data(p->irq, p);
 
-                enable_intc2_irq(p->irq);
+                disable_intc2_irq(p->irq);
         }
 }
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index b7c702821e6f..6d3c91897774 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -96,6 +96,19 @@ static struct intc2_data intc2_irq_table[] = {
         {109,12,  0, 4,  0,  3},        /* CMTI */
 };
 
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xfe080000,
+        .msk_base       = 0xfe080040,
+        .mskclr_base    = 0xfe080060,
+
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+
+        .chip = {
+                .name   = "INTC2-sh7760",
+        },
+};
+
 static struct ipr_data sh7760_ipr_map[] = {
         /* IRQ, IPR-idx, shift, priority */
         { 16, 0, 12, 2 }, /* TMU0 TUNI*/
@@ -143,7 +156,7 @@ unsigned int map_ipridx_to_addr(int idx)
 
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
 
 void __init  init_IRQ_ipr(void)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 9aeaa2ddaa28..b57c760bffde 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -102,7 +102,20 @@ static struct intc2_data intc2_irq_table[] = {
         { 68, 0x14,  8, 0, 18, 2 },     /* PCIC4 */
 };
 
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+
+        .chip = {
+                .name   = "INTC2-sh7780",
+        },
+};
+
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 07b0de82cfe6..ce10ec5d6914 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -97,7 +97,21 @@ static struct intc2_data intc2_irq_table[] = {
         { 60, 12, 16, 0, 7, 3 },        /* SCIF5 ERI, RXI, BRI, TXI */
 };
 
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+
+        .chip = {
+                .name   = "INTC2-sh7785",
+        },
+};
+
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
+