sh: Get the mach-cayman IRQ support building.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

8 files changed, 294 insertions, 133 deletions

diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 81d37e948b86..cc1836e47a5d 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -4,5 +4,6 @@
 obj-y   += intc.o
 
 obj-$(CONFIG_SUPERH32)                  += imask.o
+obj-$(CONFIG_CPU_SH5)                   += intc-sh5.o
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)           += ipr.o
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)       += maskreg.o
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c
new file mode 100644
index 000000000000..49b845a31fff
--- /dev/null
+++ b/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -0,0 +1,257 @@
+/*
+ * 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.
+ *
+ * arch/sh64/kernel/irq_intc.c
+ *
+ * Copyright (C) 2000, 2001  Paolo Alberelli
+ * Copyright (C) 2003  Paul Mundt
+ *
+ * Interrupt Controller support for SH5 INTC.
+ * Per-interrupt selective. IRLM=0 (Fixed priority) is not
+ * supported being useless without a cascaded interrupt
+ * controller.
+ *
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <asm/cpu/irq.h>
+#include <asm/page.h>
+
+/*
+ * Maybe the generic Peripheral block could move to a more
+ * generic include file. INTC Block will be defined here
+ * and only here to make INTC self-contained in a single
+ * file.
+ */
+#define INTC_BLOCK_OFFSET       0x01000000
+
+/* Base */
+#define INTC_BASE               PHYS_PERIPHERAL_BLOCK + \
+                                INTC_BLOCK_OFFSET
+
+/* Address */
+#define INTC_ICR_SET            (intc_virt + 0x0)
+#define INTC_ICR_CLEAR          (intc_virt + 0x8)
+#define INTC_INTPRI_0           (intc_virt + 0x10)
+#define INTC_INTSRC_0           (intc_virt + 0x50)
+#define INTC_INTSRC_1           (intc_virt + 0x58)
+#define INTC_INTREQ_0           (intc_virt + 0x60)
+#define INTC_INTREQ_1           (intc_virt + 0x68)
+#define INTC_INTENB_0           (intc_virt + 0x70)
+#define INTC_INTENB_1           (intc_virt + 0x78)
+#define INTC_INTDSB_0           (intc_virt + 0x80)
+#define INTC_INTDSB_1           (intc_virt + 0x88)
+
+#define INTC_ICR_IRLM           0x1
+#define INTC_INTPRI_PREGS       8               /* 8 Priority Registers */
+#define INTC_INTPRI_PPREG       8               /* 8 Priorities per Register */
+
+
+/*
+ * Mapper between the vector ordinal and the IRQ number
+ * passed to kernel/device drivers.
+ */
+int intc_evt_to_irq[(0xE20/0x20)+1] = {
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0x000 - 0x0E0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0x100 - 0x1E0 */
+         0,  0,  0,  0,  0,  1,  0,  0, /* 0x200 - 0x2E0 */
+         2,  0,  0,  3,  0,  0,  0, -1, /* 0x300 - 0x3E0 */
+        32, 33, 34, 35, 36, 37, 38, -1, /* 0x400 - 0x4E0 */
+        -1, -1, -1, 63, -1, -1, -1, -1, /* 0x500 - 0x5E0 */
+        -1, -1, 18, 19, 20, 21, 22, -1, /* 0x600 - 0x6E0 */
+        39, 40, 41, 42, -1, -1, -1, -1, /* 0x700 - 0x7E0 */
+         4,  5,  6,  7, -1, -1, -1, -1, /* 0x800 - 0x8E0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0x900 - 0x9E0 */
+        12, 13, 14, 15, 16, 17, -1, -1, /* 0xA00 - 0xAE0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0xB00 - 0xBE0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0xC00 - 0xCE0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, /* 0xD00 - 0xDE0 */
+        -1, -1                          /* 0xE00 - 0xE20 */
+};
+
+/*
+ * Opposite mapper.
+ */
+static int IRQ_to_vectorN[NR_INTC_IRQS] = {
+        0x12, 0x15, 0x18, 0x1B, 0x40, 0x41, 0x42, 0x43, /*  0- 7 */
+          -1,   -1,   -1,   -1, 0x50, 0x51, 0x52, 0x53, /*  8-15 */
+        0x54, 0x55, 0x32, 0x33, 0x34, 0x35, 0x36,   -1, /* 16-23 */
+          -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, /* 24-31 */
+        0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x38, /* 32-39 */
+        0x39, 0x3A, 0x3B,   -1,   -1,   -1,   -1,   -1, /* 40-47 */
+          -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, /* 48-55 */
+          -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x2B, /* 56-63 */
+
+};
+
+static unsigned long intc_virt;
+
+static unsigned int startup_intc_irq(unsigned int irq);
+static void shutdown_intc_irq(unsigned int irq);
+static void enable_intc_irq(unsigned int irq);
+static void disable_intc_irq(unsigned int irq);
+static void mask_and_ack_intc(unsigned int);
+static void end_intc_irq(unsigned int irq);
+
+static struct hw_interrupt_type intc_irq_type = {
+        .typename = "INTC",
+        .startup = startup_intc_irq,
+        .shutdown = shutdown_intc_irq,
+        .enable = enable_intc_irq,
+        .disable = disable_intc_irq,
+        .ack = mask_and_ack_intc,
+        .end = end_intc_irq
+};
+
+static int irlm;                /* IRL mode */
+
+static unsigned int startup_intc_irq(unsigned int irq)
+{
+        enable_intc_irq(irq);
+        return 0; /* never anything pending */
+}
+
+static void shutdown_intc_irq(unsigned int irq)
+{
+        disable_intc_irq(irq);
+}
+
+static void enable_intc_irq(unsigned int irq)
+{
+        unsigned long reg;
+        unsigned long bitmask;
+
+        if ((irq <= IRQ_IRL3) && (irlm == NO_PRIORITY))
+                printk("Trying to use straight IRL0-3 with an encoding platform.\n");
+
+        if (irq < 32) {
+                reg = INTC_INTENB_0;
+                bitmask = 1 << irq;
+        } else {
+                reg = INTC_INTENB_1;
+                bitmask = 1 << (irq - 32);
+        }
+
+        ctrl_outl(bitmask, reg);
+}
+
+static void disable_intc_irq(unsigned int irq)
+{
+        unsigned long reg;
+        unsigned long bitmask;
+
+        if (irq < 32) {
+                reg = INTC_INTDSB_0;
+                bitmask = 1 << irq;
+        } else {
+                reg = INTC_INTDSB_1;
+                bitmask = 1 << (irq - 32);
+        }
+
+        ctrl_outl(bitmask, reg);
+}
+
+static void mask_and_ack_intc(unsigned int irq)
+{
+        disable_intc_irq(irq);
+}
+
+static void end_intc_irq(unsigned int irq)
+{
+        enable_intc_irq(irq);
+}
+
+/* For future use, if we ever support IRLM=0) */
+void make_intc_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].chip = &intc_irq_type;
+        disable_intc_irq(irq);
+}
+
+#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL)
+int intc_irq_describe(char* p, int irq)
+{
+        if (irq < NR_INTC_IRQS)
+                return sprintf(p, "(0x%3x)", IRQ_to_vectorN[irq]*0x20);
+        else
+                return 0;
+}
+#endif
+
+void __init plat_irq_setup(void)
+{
+        unsigned long long __dummy0, __dummy1=~0x00000000100000f0;
+        unsigned long reg;
+        unsigned long data;
+        int i;
+
+        intc_virt = onchip_remap(INTC_BASE, 1024, "INTC");
+        if (!intc_virt) {
+                panic("Unable to remap INTC\n");
+        }
+
+
+        /* Set default: per-line enable/disable, priority driven ack/eoi */
+        for (i = 0; i < NR_INTC_IRQS; i++) {
+                if (platform_int_priority[i] != NO_PRIORITY) {
+                        irq_desc[i].chip = &intc_irq_type;
+                }
+        }
+
+
+        /* Disable all interrupts and set all priorities to 0 to avoid trouble */
+        ctrl_outl(-1, INTC_INTDSB_0);
+        ctrl_outl(-1, INTC_INTDSB_1);
+
+        for (reg = INTC_INTPRI_0, i = 0; i < INTC_INTPRI_PREGS; i++, reg += 8)
+                ctrl_outl( NO_PRIORITY, reg);
+
+
+        /* Set IRLM */
+        /* If all the priorities are set to 'no priority', then
+         * assume we are using encoded mode.
+         */
+        irlm = platform_int_priority[IRQ_IRL0] + platform_int_priority[IRQ_IRL1] + \
+                platform_int_priority[IRQ_IRL2] + platform_int_priority[IRQ_IRL3];
+
+        if (irlm == NO_PRIORITY) {
+                /* IRLM = 0 */
+                reg = INTC_ICR_CLEAR;
+                i = IRQ_INTA;
+                printk("Trying to use encoded IRL0-3. IRLs unsupported.\n");
+        } else {
+                /* IRLM = 1 */
+                reg = INTC_ICR_SET;
+                i = IRQ_IRL0;
+        }
+        ctrl_outl(INTC_ICR_IRLM, reg);
+
+        /* Set interrupt priorities according to platform description */
+        for (data = 0, reg = INTC_INTPRI_0; i < NR_INTC_IRQS; i++) {
+                data |= platform_int_priority[i] << ((i % INTC_INTPRI_PPREG) * 4);
+                if ((i % INTC_INTPRI_PPREG) == (INTC_INTPRI_PPREG - 1)) {
+                        /* Upon the 7th, set Priority Register */
+                        ctrl_outl(data, reg);
+                        data = 0;
+                        reg += 8;
+                }
+        }
+
+        /*
+         * And now let interrupts come in.
+         * sti() is not enough, we need to
+         * lower priority, too.
+         */
+        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
+                             "and       %0, %1, %0\n\t"
+                             "putcon    %0, " __SR "\n\t"
+                             : "=&r" (__dummy0)
+                             : "r" (__dummy1));
+}
diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
index 0ef257b72e5d..8646363e9ded 100644
--- a/arch/sh/kernel/cpu/sh5/Makefile
+++ b/arch/sh/kernel/cpu/sh5/Makefile
@@ -5,7 +5,3 @@ obj-y := entry.o probe.o switchto.o
 
 obj-$(CONFIG_SH_FPU)            += fpu.o
 obj-$(CONFIG_KALLSYMS)          += unwind.o
-
-# CPU subtype setup
-obj-$(CONFIG_CPU_SUBTYPE_SH5_101)       += setup-sh5-101.o
-obj-$(CONFIG_CPU_SUBTYPE_SH5_103)       += setup-sh5-101.o
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5-101.c b/arch/sh/kernel/cpu/sh5/setup-sh5-101.c
deleted file mode 100644
index 3680012d7109..000000000000
--- a/arch/sh/kernel/cpu/sh5/setup-sh5-101.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SH5-101 Setup
- *
- *  Copyright (C) 2007  Paul Mundt
- *
- * 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/init.h>
-
-void __init plat_irq_setup(void)
-{
-        /* do nothing - all IRL interrupts are handled by the board code */
-}
diff --git a/arch/sh/mach-cayman/Makefile b/arch/sh/mach-cayman/Makefile
index 67a2258bf8c4..489a8f867368 100644
--- a/arch/sh/mach-cayman/Makefile
+++ b/arch/sh/mach-cayman/Makefile
@@ -1,11 +1,5 @@
 #
 # Makefile for the Hitachi Cayman specific parts of the kernel
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y := setup.o irq.o iomap.o
+obj-y := setup.o irq.o
 obj-$(CONFIG_HEARTBEAT) += led.o
-
diff --git a/arch/sh/mach-cayman/iomap.c b/arch/sh/mach-cayman/iomap.c
deleted file mode 100644
index a5c645f02d57..000000000000
--- a/arch/sh/mach-cayman/iomap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * arch/sh64/mach-cayman/iomap.c
- *
- * Cayman iomap interface
- *
- * Copyright (C) 2004  Paul Mundt
- *
- * 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 <asm/io.h>
-#include <asm/cayman.h>
-
-void __iomem *ioport_map(unsigned long port, unsigned int len)
-{
-        if (port < 0x400)
-                return (void __iomem *)((port << 2) | smsc_superio_virt);
-
-        return (void __iomem *)port;
-}
-
diff --git a/arch/sh/mach-cayman/irq.c b/arch/sh/mach-cayman/irq.c
index aaad36d37d1f..30ec7bebfaf1 100644
--- a/arch/sh/mach-cayman/irq.c
+++ b/arch/sh/mach-cayman/irq.c
@@ -1,24 +1,26 @@
 /*
- * 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.
- *
- * arch/sh64/kernel/irq_cayman.c
- *
- * SH-5 Cayman Interrupt Support
+ * arch/sh/mach-cayman/irq.c - SH-5 Cayman Interrupt Support
  *
  * This file handles the board specific parts of the Cayman interrupt system
  *
  * Copyright (C) 2002 Stuart Menefy
+ *
+ * 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 <asm/irq.h>
-#include <asm/page.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/signal.h>
-#include <asm/cayman.h>
+#include <asm/cpu/irq.h>
+#include <asm/page.h>
+
+/* Setup for the SMSC FDC37C935 / LAN91C100FD */
+#define SMSC_IRQ         IRQ_IRL1
+
+/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
+#define PCI2_IRQ         IRQ_IRL3
 
 unsigned long epld_virt;
 
diff --git a/arch/sh/mach-cayman/setup.c b/arch/sh/mach-cayman/setup.c
index 726c520d7eb9..8c9fa472d8f5 100644
--- a/arch/sh/mach-cayman/setup.c
+++ b/arch/sh/mach-cayman/setup.c
@@ -1,28 +1,19 @@
 /*
- * 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.
- *
- * arch/sh64/mach-cayman/setup.c
+ * arch/sh/mach-cayman/setup.c
  *
  * SH5 Cayman support
  *
- * This file handles the architecture-dependent parts of initialization
+ * Copyright (C) 2002  David J. Mckay & Benedict Gaster
+ * Copyright (C) 2003 - 2007  Paul Mundt
  *
- * Copyright David J. Mckay.
- * Needs major work!
- *
- * benedict.gaster@superh.com:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
+ * 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/init.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
-#include <asm/platform.h>
-#include <asm/irq.h>
-#include <asm/io.h>
+#include <asm/cpu/irq.h>
 
 /*
  * Platform Dependent Interrupt Priorities.
@@ -96,42 +87,6 @@
 
 unsigned long smsc_superio_virt;
 
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-        /* These must be last in the array */
-        { .name = "Kernel code", .start = 0, .end = 0 },
-        /* These must be last in the array */
-        { .name = "Kernel data", .start = 0, .end = 0 }
-};
-
-struct resource xram_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-        /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-        .readonly_rootfs =      1,
-        .initial_root_dev =     0x0100,
-        .loader_type =          1,
-        .io_res_p =             io_resources,
-        .io_res_count =         ARRAY_SIZE(io_resources),
-        .kram_res_p =           kram_resources,
-        .kram_res_count =       ARRAY_SIZE(kram_resources),
-        .xram_res_p =           xram_resources,
-        .xram_res_count =       ARRAY_SIZE(xram_resources),
-        .rom_res_p =            rom_resources,
-        .rom_res_count =        ARRAY_SIZE(rom_resources),
-};
-
 int platform_int_priority[NR_INTC_IRQS] = {
         IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
         RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
@@ -210,30 +165,23 @@ static int __init smsc_superio_setup(void)
 
         return 0;
 }
-
-/* This is grotty, but, because kernel is always referenced on the link line
- * before any devices, this is safe.
- */
 __initcall(smsc_superio_setup);
 
-void __init platform_setup(void)
-{
-        /* Cayman platform leaves the decision to head.S, for now */
-        platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
+static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len)
 {
-        /* Nothing yet .. */
-}
+        if (port < 0x400) {
+                extern unsigned long smsc_superio_virt;
+                return (void __iomem *)((port << 2) | smsc_superio_virt);
+        }
 
-void __init platform_reserve(void)
-{
-        /* Nothing yet .. */
+        return (void __iomem *)port;
 }
 
-const char *get_system_type(void)
-{
-        return "Hitachi Cayman";
-}
+extern void init_cayman_irq(void);
 
+static struct sh_machine_vector mv_cayman __initmv = {
+        .mv_name                = "Hitachi Cayman",
+        .mv_nr_irqs             = 64,
+        .mv_ioport_map          = cayman_ioport_map,
+        .mv_init_irq            = init_cayman_irq,
+};