SPIN_LOCK_UNLOCKED cleanup in arch/m68k
[linux-2.6.git] / arch / m68k / kernel / ints.c
index 4b85514..60d4d75 100644 (file)
  *           which must be served                               /Roman Zippel
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <asm/traps.h>
 #include <asm/page.h>
 #include <asm/machdep.h>
+#include <asm/cacheflush.h>
+#include <asm/irq_regs.h>
 
 #ifdef CONFIG_Q40
 #include <asm/q40ints.h>
 #endif
 
+extern u32 auto_irqhandler_fixup[];
+extern u32 user_irqhandler_fixup[];
+extern u16 user_irqvec_fixup[];
+
 /* table for system interrupt handlers */
-static irq_handler_t irq_list[SYS_IRQS];
-
-static const char *default_names[SYS_IRQS] = {
-       [0] = "spurious int",
-       [1] = "int1 handler",
-       [2] = "int2 handler",
-       [3] = "int3 handler",
-       [4] = "int4 handler",
-       [5] = "int5 handler",
-       [6] = "int6 handler",
-       [7] = "int7 handler"
+static struct irq_node *irq_list[NR_IRQS];
+static struct irq_controller *irq_controller[NR_IRQS];
+static int irq_depth[NR_IRQS];
+
+static int m68k_first_user_vec;
+
+static struct irq_controller auto_irq_controller = {
+       .name           = "auto",
+       .lock           = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
+       .startup        = m68k_irq_startup,
+       .shutdown       = m68k_irq_shutdown,
 };
 
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
+static struct irq_controller user_irq_controller = {
+       .name           = "user",
+       .lock           = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
+       .startup        = m68k_irq_startup,
+       .shutdown       = m68k_irq_shutdown,
+};
 
 #define NUM_IRQ_NODES 100
 static irq_node_t nodes[NUM_IRQ_NODES];
 
-static void dummy_enable_irq(unsigned int irq);
-static void dummy_disable_irq(unsigned int irq);
-static int dummy_request_irq(unsigned int irq,
-               irqreturn_t (*handler) (int, void *, struct pt_regs *),
-               unsigned long flags, const char *devname, void *dev_id);
-static void dummy_free_irq(unsigned int irq, void *dev_id);
-
-void (*enable_irq) (unsigned int) = dummy_enable_irq;
-void (*disable_irq) (unsigned int) = dummy_disable_irq;
-
-int (*mach_request_irq) (unsigned int, irqreturn_t (*)(int, void *, struct pt_regs *),
-                      unsigned long, const char *, void *) = dummy_request_irq;
-void (*mach_free_irq) (unsigned int, void *) = dummy_free_irq;
-
-void init_irq_proc(void);
-
 /*
  * void init_IRQ(void)
  *
@@ -101,18 +95,71 @@ void __init init_IRQ(void)
                hardirq_mask_is_broken();
        }
 
-       for (i = 0; i < SYS_IRQS; i++) {
-               if (mach_default_handler)
-                       irq_list[i].handler = (*mach_default_handler)[i];
-               irq_list[i].flags   = 0;
-               irq_list[i].dev_id  = NULL;
-               irq_list[i].devname = default_names[i];
-       }
+       for (i = IRQ_AUTO_1; i <= IRQ_AUTO_7; i++)
+               irq_controller[i] = &auto_irq_controller;
+
+       mach_init_IRQ();
+}
 
-       for (i = 0; i < NUM_IRQ_NODES; i++)
-               nodes[i].handler = NULL;
+/**
+ * m68k_setup_auto_interrupt
+ * @handler: called from auto vector interrupts
+ *
+ * setup the handler to be called from auto vector interrupts instead of the
+ * standard __m68k_handle_int(), it will be called with irq numbers in the range
+ * from IRQ_AUTO_1 - IRQ_AUTO_7.
+ */
+void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *))
+{
+       if (handler)
+               *auto_irqhandler_fixup = (u32)handler;
+       flush_icache();
+}
+
+/**
+ * m68k_setup_user_interrupt
+ * @vec: first user vector interrupt to handle
+ * @cnt: number of active user vector interrupts
+ * @handler: called from user vector interrupts
+ *
+ * setup user vector interrupts, this includes activating the specified range
+ * of interrupts, only then these interrupts can be requested (note: this is
+ * different from auto vector interrupts). An optional handler can be installed
+ * to be called instead of the default __m68k_handle_int(), it will be called
+ * with irq numbers starting from IRQ_USER.
+ */
+void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
+                                     void (*handler)(unsigned int, struct pt_regs *))
+{
+       int i;
+
+       BUG_ON(IRQ_USER + cnt >= NR_IRQS);
+       m68k_first_user_vec = vec;
+       for (i = 0; i < cnt; i++)
+               irq_controller[IRQ_USER + i] = &user_irq_controller;
+       *user_irqvec_fixup = vec - IRQ_USER;
+       if (handler)
+               *user_irqhandler_fixup = (u32)handler;
+       flush_icache();
+}
+
+/**
+ * m68k_setup_irq_controller
+ * @contr: irq controller which controls specified irq
+ * @irq: first irq to be managed by the controller
+ *
+ * Change the controller for the specified range of irq, which will be used to
+ * manage these irq. auto/user irq already have a default controller, which can
+ * be changed as well, but the controller probably should use m68k_irq_startup/
+ * m68k_irq_shutdown.
+ */
+void m68k_setup_irq_controller(struct irq_controller *contr, unsigned int irq,
+                              unsigned int cnt)
+{
+       int i;
 
-       mach_init_IRQ ();
+       for (i = 0; i < cnt; i++)
+               irq_controller[irq + i] = contr;
 }
 
 irq_node_t *new_irq_node(void)
@@ -120,84 +167,183 @@ 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)
+       for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) {
+               if (!node->handler) {
+                       memset(node, 0, sizeof(*node));
                        return node;
+               }
+       }
 
        printk ("new_irq_node: out of nodes\n");
        return NULL;
 }
 
-/*
- * We will keep these functions until I have convinced Linus to move
- * the declaration of them from include/linux/sched.h to
- * include/asm/irq.h.
- */
+int setup_irq(unsigned int irq, struct irq_node *node)
+{
+       struct irq_controller *contr;
+       struct irq_node **prev;
+       unsigned long flags;
+
+       if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
+               printk("%s: Incorrect IRQ %d from %s\n",
+                      __FUNCTION__, irq, node->devname);
+               return -ENXIO;
+       }
+
+       spin_lock_irqsave(&contr->lock, flags);
+
+       prev = irq_list + irq;
+       if (*prev) {
+               /* Can't share interrupts unless both agree to */
+               if (!((*prev)->flags & node->flags & IRQF_SHARED)) {
+                       spin_unlock_irqrestore(&contr->lock, flags);
+                       return -EBUSY;
+               }
+               while (*prev)
+                       prev = &(*prev)->next;
+       }
+
+       if (!irq_list[irq]) {
+               if (contr->startup)
+                       contr->startup(irq);
+               else
+                       contr->enable(irq);
+       }
+       node->next = NULL;
+       *prev = node;
+
+       spin_unlock_irqrestore(&contr->lock, flags);
+
+       return 0;
+}
+
 int request_irq(unsigned int irq,
-               irqreturn_t (*handler) (int, void *, struct pt_regs *),
+               irq_handler_t handler,
                unsigned long flags, const char *devname, void *dev_id)
 {
-       return mach_request_irq(irq, handler, flags, devname, dev_id);
+       struct irq_node *node;
+       int res;
+
+       node = new_irq_node();
+       if (!node)
+               return -ENOMEM;
+
+       node->handler = handler;
+       node->flags   = flags;
+       node->dev_id  = dev_id;
+       node->devname = devname;
+
+       res = setup_irq(irq, node);
+       if (res)
+               node->handler = NULL;
+
+       return res;
 }
 
 EXPORT_SYMBOL(request_irq);
 
 void free_irq(unsigned int irq, void *dev_id)
 {
-       mach_free_irq(irq, dev_id);
+       struct irq_controller *contr;
+       struct irq_node **p, *node;
+       unsigned long flags;
+
+       if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
+               printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+               return;
+       }
+
+       spin_lock_irqsave(&contr->lock, flags);
+
+       p = irq_list + irq;
+       while ((node = *p)) {
+               if (node->dev_id == dev_id)
+                       break;
+               p = &node->next;
+       }
+
+       if (node) {
+               *p = node->next;
+               node->handler = NULL;
+       } else
+               printk("%s: Removing probably wrong IRQ %d\n",
+                      __FUNCTION__, irq);
+
+       if (!irq_list[irq]) {
+               if (contr->shutdown)
+                       contr->shutdown(irq);
+               else
+                       contr->disable(irq);
+       }
+
+       spin_unlock_irqrestore(&contr->lock, flags);
 }
 
 EXPORT_SYMBOL(free_irq);
 
-int cpu_request_irq(unsigned int irq,
-                    irqreturn_t (*handler)(int, void *, struct pt_regs *),
-                    unsigned long flags, const char *devname, void *dev_id)
+void enable_irq(unsigned int irq)
 {
-       if (irq < IRQ1 || irq > IRQ7) {
-               printk("%s: Incorrect IRQ %d from %s\n",
-                      __FUNCTION__, irq, devname);
-               return -ENXIO;
-       }
+       struct irq_controller *contr;
+       unsigned long flags;
 
-#if 0
-       if (!(irq_list[irq].flags & IRQ_FLG_STD)) {
-               if (irq_list[irq].flags & IRQ_FLG_LOCK) {
-                       printk("%s: IRQ %d from %s is not replaceable\n",
-                              __FUNCTION__, irq, irq_list[irq].devname);
-                       return -EBUSY;
-               }
-               if (!(flags & IRQ_FLG_REPLACE)) {
-                       printk("%s: %s can't replace IRQ %d from %s\n",
-                              __FUNCTION__, devname, irq, irq_list[irq].devname);
-                       return -EBUSY;
-               }
+       if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
+               printk("%s: Incorrect IRQ %d\n",
+                      __FUNCTION__, irq);
+               return;
        }
-#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;
+       spin_lock_irqsave(&contr->lock, flags);
+       if (irq_depth[irq]) {
+               if (!--irq_depth[irq]) {
+                       if (contr->enable)
+                               contr->enable(irq);
+               }
+       } else
+               WARN_ON(1);
+       spin_unlock_irqrestore(&contr->lock, flags);
 }
 
-void cpu_free_irq(unsigned int irq, void *dev_id)
+EXPORT_SYMBOL(enable_irq);
+
+void disable_irq(unsigned int irq)
 {
-       if (irq < IRQ1 || irq > IRQ7) {
-               printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+       struct irq_controller *contr;
+       unsigned long flags;
+
+       if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
+               printk("%s: Incorrect IRQ %d\n",
+                      __FUNCTION__, irq);
                return;
        }
 
-       if (irq_list[irq].dev_id != dev_id)
-               printk("%s: Removing probably wrong IRQ %d from %s\n",
-                      __FUNCTION__, irq, irq_list[irq].devname);
+       spin_lock_irqsave(&contr->lock, flags);
+       if (!irq_depth[irq]++) {
+               if (contr->disable)
+                       contr->disable(irq);
+       }
+       spin_unlock_irqrestore(&contr->lock, flags);
+}
+
+EXPORT_SYMBOL(disable_irq);
+
+int m68k_irq_startup(unsigned int irq)
+{
+       if (irq <= IRQ_AUTO_7)
+               vectors[VEC_SPUR + irq] = auto_inthandler;
+       else
+               vectors[m68k_first_user_vec + irq - IRQ_USER] = user_inthandler;
+       return 0;
+}
 
-       irq_list[irq].handler = (*mach_default_handler)[irq];
-       irq_list[irq].flags   = 0;
-       irq_list[irq].dev_id  = NULL;
-       irq_list[irq].devname = default_names[irq];
+void m68k_irq_shutdown(unsigned int irq)
+{
+       if (irq <= IRQ_AUTO_7)
+               vectors[VEC_SPUR + irq] = bad_inthandler;
+       else
+               vectors[m68k_first_user_vec + irq - IRQ_USER] = bad_inthandler;
 }
 
+
 /*
  * Do we need these probe functions on the m68k?
  *
@@ -225,58 +371,57 @@ int probe_irq_off (unsigned long irqs)
 
 EXPORT_SYMBOL(probe_irq_off);
 
-static void dummy_enable_irq(unsigned int irq)
+unsigned int irq_canonicalize(unsigned int irq)
 {
-       printk("calling uninitialized enable_irq()\n");
+#ifdef CONFIG_Q40
+       if (MACH_IS_Q40 && irq == 11)
+               irq = 10;
+#endif
+       return irq;
 }
 
-static void dummy_disable_irq(unsigned int irq)
-{
-       printk("calling uninitialized disable_irq()\n");
-}
+EXPORT_SYMBOL(irq_canonicalize);
 
-static int dummy_request_irq(unsigned int irq,
-               irqreturn_t (*handler) (int, void *, struct pt_regs *),
-               unsigned long flags, const char *devname, void *dev_id)
+asmlinkage void m68k_handle_int(unsigned int irq)
 {
-       printk("calling uninitialized request_irq()\n");
-       return 0;
+       struct irq_node *node;
+       kstat_cpu(0).irqs[irq]++;
+       node = irq_list[irq];
+       do {
+               node->handler(irq, node->dev_id);
+               node = node->next;
+       } while (node);
 }
 
-static void dummy_free_irq(unsigned int irq, void *dev_id)
+asmlinkage void __m68k_handle_int(unsigned int irq, struct pt_regs *regs)
 {
-       printk("calling uninitialized disable_irq()\n");
+       struct pt_regs *old_regs;
+       old_regs = set_irq_regs(regs);
+       m68k_handle_int(irq);
+       set_irq_regs(old_regs);
 }
 
-asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
+asmlinkage void handle_badint(struct pt_regs *regs)
 {
-       if (vec >= VEC_INT1 && vec <= VEC_INT7 && !MACH_IS_BVME6000) {
-               vec -= VEC_SPUR;
-               kstat_cpu(0).irqs[vec]++;
-               irq_list[vec].handler(vec, irq_list[vec].dev_id, fp);
-       } else {
-               if (mach_process_int)
-                       mach_process_int(vec, fp);
-               else
-                       panic("Can't process interrupt vector %ld\n", vec);
-               return;
-       }
+       kstat_cpu(0).irqs[0]++;
+       printk("unexpected interrupt from %u\n", regs->vector);
 }
 
 int show_interrupts(struct seq_file *p, void *v)
 {
+       struct irq_controller *contr;
+       struct irq_node *node;
        int i = *(loff_t *) v;
 
        /* autovector interrupts */
-       if (i < SYS_IRQS) {
-               if (mach_default_handler) {
-                       seq_printf(p, "auto %2d: %10u ", i,
-                                      i ? kstat_cpu(0).irqs[i] : num_spurious);
-                       seq_puts(p, "  ");
-                       seq_printf(p, "%s\n", irq_list[i].devname);
-               }
-       } else if (i == SYS_IRQS)
-               mach_get_irq_list(p, v);
+       if (irq_list[i]) {
+               contr = irq_controller[i];
+               node = irq_list[i];
+               seq_printf(p, "%-8s %3u: %10u %s", contr->name, i, kstat_cpu(0).irqs[i], node->devname);
+               while ((node = node->next))
+                       seq_printf(p, ", %s", node->devname);
+               seq_puts(p, "\n");
+       }
        return 0;
 }