m68knommu: generic irq handling

Change the m68knommu irq handling to use the generic irq framework.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 31 insertions, 321 deletions

diff --git a/arch/m68knommu/platform/5307/Makefile b/arch/m68knommu/platform/5307/Makefile
index 2fd37dcc309b..719a313494bc 100644
--- a/arch/m68knommu/platform/5307/Makefile
+++ b/arch/m68knommu/platform/5307/Makefile
@@ -16,7 +16,7 @@ ifdef CONFIG_FULLDEBUG
 AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1
 endif
 
-obj-$(CONFIG_COLDFIRE)  += entry.o vectors.o ints.o
+obj-$(CONFIG_COLDFIRE)  += entry.o vectors.o
 obj-$(CONFIG_M5206)     += timers.o
 obj-$(CONFIG_M5206e)    += timers.o
 obj-$(CONFIG_M520x)     += pit.o
diff --git a/arch/m68knommu/platform/5307/entry.S b/arch/m68knommu/platform/5307/entry.S
index f0dba84d9101..c358aebe0af3 100644
--- a/arch/m68knommu/platform/5307/entry.S
+++ b/arch/m68knommu/platform/5307/entry.S
@@ -1,7 +1,7 @@
 /*
  *  linux/arch/m68knommu/platform/5307/entry.S
  *
- *  Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
+ *  Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com)
  *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
  *                      Kenneth Albanowski <kjahds@kjahds.com>,
  *  Copyright (C) 2000  Lineo Inc. (www.lineo.com)
@@ -155,34 +155,21 @@ Lsignal_return:
 
 /*
  * This is the generic interrupt handler (for all hardware interrupt
- * sources). It figures out the vector number and calls the appropriate
- * interrupt service routine directly.
+ * sources). Calls upto high level code to do all the work.
  */
 ENTRY(inthandler)
         SAVE_ALL
         moveq   #-1,%d0
         movel   %d0,%sp@(PT_ORIG_D0)
-        addql   #1,local_irq_count
 
         movew   %sp@(PT_FORMATVEC),%d0  /* put exception # in d0 */
         andl    #0x03fc,%d0             /* mask out vector only */
 
-        leal    per_cpu__kstat+STAT_IRQ,%a0
-        addql   #1,%a0@(%d0)
-
+        movel   %sp,%sp@-               /* push regs arg */
         lsrl    #2,%d0                  /* calculate real vector # */
-        movel   %d0,%d1                 /* calculate array offset */
-        lsll    #4,%d1
-        lea     irq_list,%a0
-        addl    %d1,%a0                 /* pointer to array struct */
-
-        movel   %sp,%sp@-               /* push regs arg onto stack */
-        movel   %a0@(8),%sp@-           /* push devid arg */
-        movel   %d0,%sp@-               /* push vector # on stack */
-
-        movel   %a0@,%a0                /* get function to call */
-        jbsr    %a0@                    /* call vector handler */
-        lea     %sp@(12),%sp            /* pop parameters off stack */
+        movel   %d0,%sp@-               /* push vector number */
+        jbsr    do_IRQ                  /* call high level irq handler */
+        lea     %sp@(8),%sp             /* pop args off stack */
 
         bra     ret_from_interrupt      /* this was fallthrough */
 
@@ -198,24 +185,15 @@ ENTRY(fasthandler)
         movew   %sp@(PT_FORMATVEC),%d0
         andl    #0x03fc,%d0             /* mask out vector only */
 
-        leal    per_cpu__kstat+STAT_IRQ,%a0
-        addql   #1,%a0@(%d0)
-
-        movel   %sp,%sp@-               /* push regs arg onto stack */
-        clrl    %sp@-                   /* push devid arg */
+        movel   %sp,%sp@-               /* push regs arg */
         lsrl    #2,%d0                  /* calculate real vector # */
-        movel   %d0,%sp@-               /* push vector # on stack */
-
-        lsll    #4,%d0                  /* adjust for array offset */
-        lea     irq_list,%a0
-        movel   %a0@(%d0),%a0           /* get function to call */
-        jbsr    %a0@                    /* call vector handler */
-        lea     %sp@(12),%sp            /* pop parameters off stack */
+        movel   %d0,%sp@-               /* push vector number */
+        jbsr    do_IRQ                  /* call high level irq handler */
+        lea     %sp@(8),%sp             /* pop args off stack */
 
         RESTORE_LOCAL
 
 ENTRY(ret_from_interrupt)
-        subql   #1,local_irq_count
         jeq     2f
 1:
         RESTORE_ALL
diff --git a/arch/m68knommu/platform/5307/ints.c b/arch/m68knommu/platform/5307/ints.c
deleted file mode 100644
index 751633038c4b..000000000000
--- a/arch/m68knommu/platform/5307/ints.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * linux/arch/m68knommu/kernel/ints.c -- General interrupt handling code
- *
- * Copyright (C) 1999-2002  Greg Ungerer (gerg@snapgear.com)
- * Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
- *                     Kenneth Albanowski <kjahds@kjahds.com>,
- * Copyright (C) 2000  Lineo Inc. (www.lineo.com) 
- *
- * Based on:
- *
- * linux/arch/m68k/kernel/ints.c -- Linux/m68k general interrupt handling code
- *
- * 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/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/errno.h>
-#include <linux/seq_file.h>
-
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/irqnode.h>
-#include <asm/traps.h>
-#include <asm/page.h>
-#include <asm/machdep.h>
-
-/*
- *      This table stores the address info for each vector handler.
- */
-struct irq_entry irq_list[SYS_IRQS];
-
-#define NUM_IRQ_NODES 16
-static irq_node_t nodes[NUM_IRQ_NODES];
-
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
-unsigned int local_irq_count[NR_CPUS];
-
-static irqreturn_t default_irq_handler(int irq, void *ptr)
-{
-#if 1
-        printk(KERN_INFO "%s(%d): default irq handler vec=%d [0x%x]\n",
-                __FILE__, __LINE__, irq, irq);
-#endif
-        return(IRQ_HANDLED);
-}
-
-/*
- * void init_IRQ(void)
- *
- * Parameters:  None
- *
- * Returns:     Nothing
- *
- * This function should be called during kernel startup to initialize
- * the IRQ handling routines.
- */
-
-void __init init_IRQ(void)
-{
-        int i;
-
-        for (i = 0; i < SYS_IRQS; i++) {
-                if (mach_default_handler)
-                        irq_list[i].handler = mach_default_handler;
-                else
-                        irq_list[i].handler = default_irq_handler;
-                irq_list[i].flags   = IRQ_FLG_STD;
-                irq_list[i].dev_id  = NULL;
-                irq_list[i].devname = NULL;
-        }
-
-        for (i = 0; i < NUM_IRQ_NODES; i++)
-                nodes[i].handler = NULL;
-
-        if (mach_init_IRQ)
-                mach_init_IRQ();
-}
-
-irq_node_t *new_irq_node(void)
-{
-        irq_node_t *node;
-        short i;
-
-        for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--)
-                if (!node->handler)
-                        return node;
-
-        printk(KERN_INFO "new_irq_node: out of nodes\n");
-        return NULL;
-}
-
-int request_irq(
-        unsigned int irq,
-        irq_handler_t handler,
-        unsigned long flags,
-        const char *devname,
-        void *dev_id)
-{
-        if (irq < 0 || irq >= NR_IRQS) {
-                printk(KERN_WARNING "%s: Incorrect IRQ %d from %s\n", __FUNCTION__,
-                        irq, devname);
-                return -ENXIO;
-        }
-
-        if (!(irq_list[irq].flags & IRQ_FLG_STD)) {
-                if (irq_list[irq].flags & IRQ_FLG_LOCK) {
-                        printk(KERN_WARNING "%s: IRQ %d from %s is not replaceable\n",
-                               __FUNCTION__, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-                if (flags & IRQ_FLG_REPLACE) {
-                        printk(KERN_WARNING "%s: %s can't replace IRQ %d from %s\n",
-                               __FUNCTION__, devname, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-        }
-
-        if (flags & IRQ_FLG_FAST) {
-                extern asmlinkage void fasthandler(void);
-                extern void set_evector(int vecnum, void (*handler)(void));
-                set_evector(irq, fasthandler);
-        }
-
-        irq_list[irq].handler = handler;
-        irq_list[irq].flags   = flags;
-        irq_list[irq].dev_id  = dev_id;
-        irq_list[irq].devname = devname;
-        return 0;
-}
-
-EXPORT_SYMBOL(request_irq);
-
-void free_irq(unsigned int irq, void *dev_id)
-{
-        if (irq >= NR_IRQS) {
-                printk(KERN_WARNING "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-                return;
-        }
-
-        if (irq_list[irq].dev_id != dev_id)
-                printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
-                       __FUNCTION__, irq, irq_list[irq].devname);
-
-        if (irq_list[irq].flags & IRQ_FLG_FAST) {
-                extern asmlinkage void inthandler(void);
-                extern void set_evector(int vecnum, void (*handler)(void));
-                set_evector(irq, inthandler);
-        }
-
-        if (mach_default_handler)
-                irq_list[irq].handler = mach_default_handler;
-        else
-                irq_list[irq].handler = default_irq_handler;
-        irq_list[irq].flags   = IRQ_FLG_STD;
-        irq_list[irq].dev_id  = NULL;
-        irq_list[irq].devname = NULL;
-}
-
-EXPORT_SYMBOL(free_irq);
-
-
-int sys_request_irq(unsigned int irq, irq_handler_t handler, 
-                    unsigned long flags, const char *devname, void *dev_id)
-{
-        if (irq > IRQ7) {
-                printk(KERN_WARNING "%s: Incorrect IRQ %d from %s\n",
-                       __FUNCTION__, irq, devname);
-                return -ENXIO;
-        }
-
-#if 0
-        if (!(irq_list[irq].flags & IRQ_FLG_STD)) {
-                if (irq_list[irq].flags & IRQ_FLG_LOCK) {
-                        printk(KERN_WARNING "%s: IRQ %d from %s is not replaceable\n",
-                               __FUNCTION__, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-                if (!(flags & IRQ_FLG_REPLACE)) {
-                        printk(KERN_WARNING "%s: %s can't replace IRQ %d from %s\n",
-                               __FUNCTION__, devname, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-        }
-#endif
-
-        irq_list[irq].handler = handler;
-        irq_list[irq].flags   = flags;
-        irq_list[irq].dev_id  = dev_id;
-        irq_list[irq].devname = devname;
-        return 0;
-}
-
-void sys_free_irq(unsigned int irq, void *dev_id)
-{
-        if (irq > IRQ7) {
-                printk(KERN_WARNING "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-                return;
-        }
-
-        if (irq_list[irq].dev_id != dev_id)
-                printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
-                       __FUNCTION__, irq, irq_list[irq].devname);
-
-        irq_list[irq].handler = mach_default_handler;
-        irq_list[irq].flags   = 0;
-        irq_list[irq].dev_id  = NULL;
-        irq_list[irq].devname = NULL;
-}
-
-/*
- * Do we need these probe functions on the m68k?
- *
- *  ... may be useful with ISA devices
- */
-unsigned long probe_irq_on (void)
-{
-        return 0;
-}
-
-EXPORT_SYMBOL(probe_irq_on);
-
-int probe_irq_off (unsigned long irqs)
-{
-        return 0;
-}
-
-EXPORT_SYMBOL(probe_irq_off);
-
-asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
-{
-        if (vec >= VEC_INT1 && vec <= VEC_INT7) {
-                vec -= VEC_SPUR;
-                kstat_cpu(0).irqs[vec]++;
-                irq_list[vec].handler(vec, irq_list[vec].dev_id);
-        } else {
-                if (mach_process_int)
-                        mach_process_int(vec, fp);
-                else
-                        panic("Can't process interrupt vector %ld\n", vec);
-                return;
-        }
-}
-
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-        int i = *(loff_t *) v;
-
-        if (i < NR_IRQS) {
-                if (! (irq_list[i].flags & IRQ_FLG_STD)) {
-                        seq_printf(p, "%3d: %10u ", i,
-                                (i ? kstat_cpu(0).irqs[i] : num_spurious));
-                        if (irq_list[i].flags & IRQ_FLG_LOCK)
-                                seq_printf(p, "L ");
-                        else
-                                seq_printf(p, "  ");
-                        seq_printf(p, "%s\n", irq_list[i].devname);
-                }
-        }
-
-        if (i == NR_IRQS && mach_get_irq_list)
-                mach_get_irq_list(p, v);
-        return 0;
-}
-
-void init_irq_proc(void)
-{
-        /* Insert /proc/irq driver here */
-}
-
diff --git a/arch/m68knommu/platform/5307/vectors.c b/arch/m68knommu/platform/5307/vectors.c
index 2a8b0d044ce5..6cf894620234 100644
--- a/arch/m68knommu/platform/5307/vectors.c
+++ b/arch/m68knommu/platform/5307/vectors.c
@@ -3,23 +3,17 @@
 /*
  *      linux/arch/m68knommu/platform/5307/vectors.c
  *
- *      Copyright (C) 1999-2003, Greg Ungerer <gerg@snapgear.com>
+ *      Copyright (C) 1999-2007, Greg Ungerer <gerg@snapgear.com>
  */
 
 /***************************************************************************/
 
 #include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/param.h>
 #include <linux/init.h>
-#include <linux/unistd.h>
-#include <linux/delay.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
+#include <linux/irq.h>
 #include <asm/traps.h>
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
-#include <asm/mcftimer.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfdma.h>
 #include <asm/mcfwdebug.h>
@@ -56,7 +50,7 @@ asmlinkage void trap(void);
 asmlinkage void system_call(void);
 asmlinkage void inthandler(void);
 
-void __init coldfire_trap_init(void)
+void __init init_vectors(void)
 {
         int i;
 
@@ -86,6 +80,23 @@ void __init coldfire_trap_init(void)
 
 /***************************************************************************/
 
+void enable_vector(unsigned int irq)
+{
+        /* Currently no action on ColdFire */
+}
+
+void disable_vector(unsigned int irq)
+{
+        /* Currently no action on ColdFire */
+}
+
+void ack_vector(unsigned int irq)
+{
+        /* Currently no action on ColdFire */
+}
+
+/***************************************************************************/
+
 void coldfire_reset(void)
 {
         HARD_RESET_NOW();