[PATCH] m68k: convert hp300 irq code

Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] m68k: convert hp300 irq code
Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roman Zippel · Linus Torvalds
1 parent 734085651c
Showing 5 changed files with 6 additions and 194 deletions Side-by-side Diff
arch/m68k/hp300/Makefile
arch/m68k/hp300/config.c
arch/m68k/hp300/ints.c
arch/m68k/hp300/ints.h
arch/m68k/hp300/time.c
@@ -2,5 +2,5 @@
 # Makefile for Linux arch/m68k/hp300 source directory
 #
  
-obj-y		:= ksyms.o config.o ints.o time.o reboot.o
+obj-y		:= ksyms.o config.o time.o reboot.o
@@ -21,7 +21,6 @@
 #include <asm/hp300hw.h>
 #include <asm/rtc.h>
  
-#include "ints.h"
 #include "time.h"
  
 unsigned long hp300_model;
@@ -64,8 +63,6 @@
 static char hp300_model_name[13] = "HP9000/";
  
 extern void hp300_reset(void);
-extern irqreturn_t (*hp300_default_handler[])(int, void *, struct pt_regs *);
-extern int show_hp300_interrupts(struct seq_file *, void *);
 #ifdef CONFIG_SERIAL_8250_CONSOLE
 extern int hp300_setup_serial_console(void) __init;
 #endif
  
  
  
@@ -245,16 +242,16 @@
 		hp300_rtc_read(RTC_REG_SEC2);
 }
  
+static void __init hp300_init_IRQ(void)
+{
+}
+
 void __init config_hp300(void)
 {
 	mach_sched_init      = hp300_sched_init;
 	mach_init_IRQ        = hp300_init_IRQ;
-	mach_request_irq     = hp300_request_irq;
-	mach_free_irq        = hp300_free_irq;
 	mach_get_model       = hp300_get_model;
-	mach_get_irq_list    = show_hp300_interrupts;
 	mach_gettimeoffset   = hp300_gettimeoffset;
-	mach_default_handler = &hp300_default_handler;
 	mach_hwclk	     = hp300_hwclk;
 	mach_get_ss	     = hp300_get_ss;
 	mach_reset           = hp300_reset;
-/*
- *  linux/arch/m68k/hp300/ints.c
- *
- *  Copyright (C) 1998 Philip Blundell <philb@gnu.org>
- *
- *  This file contains the HP300-specific interrupt handling.
- *  We only use the autovector interrupts, and therefore we need to
- *  maintain lists of devices sharing each ipl.
- *  [ipl list code added by Peter Maydell <pmaydell@chiark.greenend.org.uk> 06/1998]
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <asm/machdep.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/traps.h>
-#include <asm/ptrace.h>
-#include <asm/errno.h>
-#include "ints.h"
-
-/* Each ipl has a linked list of interrupt service routines.
- * Service routines are added via hp300_request_irq() and removed
- * via hp300_free_irq(). The device driver should set IRQ_FLG_FAST
- * if it needs to be serviced early (eg FIFOless UARTs); this will
- * cause it to be added at the front of the queue rather than
- * the back.
- * Currently IRQ_FLG_SLOW and flags=0 are treated identically; if
- * we needed three levels of priority we could distinguish them
- * but this strikes me as mildly ugly...
- */
-
-/* we start with no entries in any list */
-static irq_node_t *hp300_irq_list[HP300_NUM_IRQS];
-
-static spinlock_t irqlist_lock;
-
-/* This handler receives all interrupts, dispatching them to the registered handlers */
-static irqreturn_t hp300_int_handler(int irq, void *dev_id, struct pt_regs *fp)
-{
-        irq_node_t *t;
-        /* We just give every handler on the chain an opportunity to handle
-         * the interrupt, in priority order.
-         */
-        for(t = hp300_irq_list[irq]; t; t=t->next)
-                t->handler(irq, t->dev_id, fp);
-        /* We could put in some accounting routines, checks for stray interrupts,
-         * etc, in here. Note that currently we can't tell whether or not
-         * a handler handles the interrupt, though.
-         */
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t hp300_badint(int irq, void *dev_id, struct pt_regs *fp)
-{
-	num_spurious += 1;
-	return IRQ_NONE;
-}
-
-irqreturn_t (*hp300_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {
-	[0] = hp300_badint,
-	[1] = hp300_int_handler,
-	[2] = hp300_int_handler,
-	[3] = hp300_int_handler,
-	[4] = hp300_int_handler,
-	[5] = hp300_int_handler,
-	[6] = hp300_int_handler,
-	[7] = hp300_int_handler
-};
-
-/* dev_id had better be unique to each handler because it's the only way we have
- * to distinguish handlers when removing them...
- *
- * It would be pretty easy to support IRQ_FLG_LOCK (handler is not replacable)
- * and IRQ_FLG_REPLACE (handler replaces existing one with this dev_id)
- * if we wanted to. IRQ_FLG_FAST is needed for devices where interrupt latency
- * matters (eg the dreaded FIFOless UART...)
- */
-int hp300_request_irq(unsigned int irq,
-                      irqreturn_t (*handler) (int, void *, struct pt_regs *),
-                      unsigned long flags, const char *devname, void *dev_id)
-{
-        irq_node_t *t, *n = new_irq_node();
-
-        if (!n)                                   /* oops, no free nodes */
-                return -ENOMEM;
-
-	spin_lock_irqsave(&irqlist_lock, flags);
-
-        if (!hp300_irq_list[irq]) {
-                /* no list yet */
-                hp300_irq_list[irq] = n;
-                n->next = NULL;
-        } else if (flags & IRQ_FLG_FAST) {
-                /* insert at head of list */
-                n->next = hp300_irq_list[irq];
-                hp300_irq_list[irq] = n;
-        } else {
-                /* insert at end of list */
-                for(t = hp300_irq_list[irq]; t->next; t = t->next)
-                        /* do nothing */;
-                n->next = NULL;
-                t->next = n;
-        }
-
-        /* Fill in n appropriately */
-        n->handler = handler;
-        n->flags = flags;
-        n->dev_id = dev_id;
-        n->devname = devname;
-	spin_unlock_irqrestore(&irqlist_lock, flags);
-	return 0;
-}
-
-void hp300_free_irq(unsigned int irq, void *dev_id)
-{
-        irq_node_t *t;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irqlist_lock, flags);
-
-        t = hp300_irq_list[irq];
-        if (!t)                                   /* no handlers at all for that IRQ */
-        {
-                printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);
-                spin_unlock_irqrestore(&irqlist_lock, flags);
-		return;
-        }
-
-        if (t->dev_id == dev_id)
-        {                                         /* removing first handler on chain */
-                t->flags = IRQ_FLG_STD;           /* we probably don't really need these */
-                t->dev_id = NULL;
-                t->devname = NULL;
-                t->handler = NULL;                /* frees this irq_node_t */
-                hp300_irq_list[irq] = t->next;
-		spin_unlock_irqrestore(&irqlist_lock, flags);
-		return;
-        }
-
-        /* OK, must be removing from middle of the chain */
-
-        for (t = hp300_irq_list[irq]; t->next && t->next->dev_id != dev_id; t = t->next)
-                /* do nothing */;
-        if (!t->next)
-        {
-                printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);
-		spin_unlock_irqrestore(&irqlist_lock, flags);
-		return;
-        }
-        /* remove the entry after t: */
-        t->next->flags = IRQ_FLG_STD;
-        t->next->dev_id = NULL;
-	t->next->devname = NULL;
-	t->next->handler = NULL;
-        t->next = t->next->next;
-
-	spin_unlock_irqrestore(&irqlist_lock, flags);
-}
-
-int show_hp300_interrupts(struct seq_file *p, void *v)
-{
-	return 0;
-}
-
-void __init hp300_init_IRQ(void)
-{
-	spin_lock_init(&irqlist_lock);
-}
-extern void hp300_init_IRQ(void);
-extern void (*hp300_handlers[8])(int, void *, struct pt_regs *);
-extern void hp300_free_irq(unsigned int irq, void *dev_id);
-extern int hp300_request_irq(unsigned int irq,
-		irqreturn_t (*handler) (int, void *, struct pt_regs *),
-		unsigned long flags, const char *devname, void *dev_id);
-
-/* number of interrupts, includes 0 (what's that?) */
-#define HP300_NUM_IRQS 8
@@ -18,7 +18,6 @@
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/blinken.h>
-#include "ints.h"
  
 /* Clock hardware definitions */
  
@@ -71,7 +70,7 @@
  
   asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
  
-  cpu_request_irq(6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
+  request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
  
   out_8(CLOCKBASE + CLKCR2, 0x1);		/* select CR1 */
   out_8(CLOCKBASE + CLKCR1, 0x40);		/* enable irq */
...	...	@@ -2,5 +2,5 @@
2	2	# Makefile for Linux arch/m68k/hp300 source directory
3	3	#
4	4
5		-obj-y := ksyms.o config.o ints.o time.o reboot.o
	5	+obj-y := ksyms.o config.o time.o reboot.o
...	...	@@ -21,7 +21,6 @@
21	21	#include <asm/hp300hw.h>
22	22	#include <asm/rtc.h>
23	23
24		-#include "ints.h"
25	24	#include "time.h"
26	25
27	26	unsigned long hp300_model;
...	...	@@ -64,8 +63,6 @@
64	63	static char hp300_model_name[13] = "HP9000/";
65	64
66	65	extern void hp300_reset(void);
67		-extern irqreturn_t (hp300_default_handler[])(int, void , struct pt_regs *);
68		-extern int show_hp300_interrupts(struct seq_file , void );
69	66	#ifdef CONFIG_SERIAL_8250_CONSOLE
70	67	extern int hp300_setup_serial_console(void) __init;
71	68	#endif
72	69
73	70
74	71
...	...	@@ -245,16 +242,16 @@
245	242	hp300_rtc_read(RTC_REG_SEC2);
246	243	}
247	244
	245	+static void __init hp300_init_IRQ(void)
	246	+{
	247	+}
	248	+
248	249	void __init config_hp300(void)
249	250	{
250	251	mach_sched_init = hp300_sched_init;
251	252	mach_init_IRQ = hp300_init_IRQ;
252		- mach_request_irq = hp300_request_irq;
253		- mach_free_irq = hp300_free_irq;
254	253	mach_get_model = hp300_get_model;
255		- mach_get_irq_list = show_hp300_interrupts;
256	254	mach_gettimeoffset = hp300_gettimeoffset;
257		- mach_default_handler = &hp300_default_handler;
258	255	mach_hwclk = hp300_hwclk;
259	256	mach_get_ss = hp300_get_ss;
260	257	mach_reset = hp300_reset;
1		-/*
2		- * linux/arch/m68k/hp300/ints.c
3		- *
4		- * Copyright (C) 1998 Philip Blundell <philb@gnu.org>
5		- *
6		- * This file contains the HP300-specific interrupt handling.
7		- * We only use the autovector interrupts, and therefore we need to
8		- * maintain lists of devices sharing each ipl.
9		- * [ipl list code added by Peter Maydell <pmaydell@chiark.greenend.org.uk> 06/1998]
10		- */
11		-
12		-#include <linux/kernel.h>
13		-#include <linux/types.h>
14		-#include <linux/init.h>
15		-#include <linux/sched.h>
16		-#include <linux/kernel_stat.h>
17		-#include <linux/interrupt.h>
18		-#include <linux/spinlock.h>
19		-#include <asm/machdep.h>
20		-#include <asm/irq.h>
21		-#include <asm/io.h>
22		-#include <asm/system.h>
23		-#include <asm/traps.h>
24		-#include <asm/ptrace.h>
25		-#include <asm/errno.h>
26		-#include "ints.h"
27		-
28		-/* Each ipl has a linked list of interrupt service routines.
29		- * Service routines are added via hp300_request_irq() and removed
30		- * via hp300_free_irq(). The device driver should set IRQ_FLG_FAST
31		- * if it needs to be serviced early (eg FIFOless UARTs); this will
32		- * cause it to be added at the front of the queue rather than
33		- * the back.
34		- * Currently IRQ_FLG_SLOW and flags=0 are treated identically; if
35		- * we needed three levels of priority we could distinguish them
36		- * but this strikes me as mildly ugly...
37		- */
38		-
39		-/* we start with no entries in any list */
40		-static irq_node_t *hp300_irq_list[HP300_NUM_IRQS];
41		-
42		-static spinlock_t irqlist_lock;
43		-
44		-/* This handler receives all interrupts, dispatching them to the registered handlers */
45		-static irqreturn_t hp300_int_handler(int irq, void dev_id, struct pt_regs fp)
46		-{
47		- irq_node_t *t;
48		- /* We just give every handler on the chain an opportunity to handle
49		- * the interrupt, in priority order.
50		- */
51		- for(t = hp300_irq_list[irq]; t; t=t->next)
52		- t->handler(irq, t->dev_id, fp);
53		- /* We could put in some accounting routines, checks for stray interrupts,
54		- * etc, in here. Note that currently we can't tell whether or not
55		- * a handler handles the interrupt, though.
56		- */
57		- return IRQ_HANDLED;
58		-}
59		-
60		-static irqreturn_t hp300_badint(int irq, void dev_id, struct pt_regs fp)
61		-{
62		- num_spurious += 1;
63		- return IRQ_NONE;
64		-}
65		-
66		-irqreturn_t (hp300_default_handler[SYS_IRQS])(int, void , struct pt_regs *) = {
67		- [0] = hp300_badint,
68		- [1] = hp300_int_handler,
69		- [2] = hp300_int_handler,
70		- [3] = hp300_int_handler,
71		- [4] = hp300_int_handler,
72		- [5] = hp300_int_handler,
73		- [6] = hp300_int_handler,
74		- [7] = hp300_int_handler
75		-};
76		-
77		-/* dev_id had better be unique to each handler because it's the only way we have
78		- * to distinguish handlers when removing them...
79		- *
80		- * It would be pretty easy to support IRQ_FLG_LOCK (handler is not replacable)
81		- * and IRQ_FLG_REPLACE (handler replaces existing one with this dev_id)
82		- * if we wanted to. IRQ_FLG_FAST is needed for devices where interrupt latency
83		- * matters (eg the dreaded FIFOless UART...)
84		- */
85		-int hp300_request_irq(unsigned int irq,
86		- irqreturn_t (handler) (int, void , struct pt_regs *),
87		- unsigned long flags, const char devname, void dev_id)
88		-{
89		- irq_node_t t, n = new_irq_node();
90		-
91		- if (!n) /* oops, no free nodes */
92		- return -ENOMEM;
93		-
94		- spin_lock_irqsave(&irqlist_lock, flags);
95		-
96		- if (!hp300_irq_list[irq]) {
97		- /* no list yet */
98		- hp300_irq_list[irq] = n;
99		- n->next = NULL;
100		- } else if (flags & IRQ_FLG_FAST) {
101		- /* insert at head of list */
102		- n->next = hp300_irq_list[irq];
103		- hp300_irq_list[irq] = n;
104		- } else {
105		- /* insert at end of list */
106		- for(t = hp300_irq_list[irq]; t->next; t = t->next)
107		- /* do nothing */;
108		- n->next = NULL;
109		- t->next = n;
110		- }
111		-
112		- /* Fill in n appropriately */
113		- n->handler = handler;
114		- n->flags = flags;
115		- n->dev_id = dev_id;
116		- n->devname = devname;
117		- spin_unlock_irqrestore(&irqlist_lock, flags);
118		- return 0;
119		-}
120		-
121		-void hp300_free_irq(unsigned int irq, void *dev_id)
122		-{
123		- irq_node_t *t;
124		- unsigned long flags;
125		-
126		- spin_lock_irqsave(&irqlist_lock, flags);
127		-
128		- t = hp300_irq_list[irq];
129		- if (!t) /* no handlers at all for that IRQ */
130		- {
131		- printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);
132		- spin_unlock_irqrestore(&irqlist_lock, flags);
133		- return;
134		- }
135		-
136		- if (t->dev_id == dev_id)
137		- { /* removing first handler on chain */
138		- t->flags = IRQ_FLG_STD; /* we probably don't really need these */
139		- t->dev_id = NULL;
140		- t->devname = NULL;
141		- t->handler = NULL; /* frees this irq_node_t */
142		- hp300_irq_list[irq] = t->next;
143		- spin_unlock_irqrestore(&irqlist_lock, flags);
144		- return;
145		- }
146		-
147		- /* OK, must be removing from middle of the chain */
148		-
149		- for (t = hp300_irq_list[irq]; t->next && t->next->dev_id != dev_id; t = t->next)
150		- /* do nothing */;
151		- if (!t->next)
152		- {
153		- printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);
154		- spin_unlock_irqrestore(&irqlist_lock, flags);
155		- return;
156		- }
157		- /* remove the entry after t: */
158		- t->next->flags = IRQ_FLG_STD;
159		- t->next->dev_id = NULL;
160		- t->next->devname = NULL;
161		- t->next->handler = NULL;
162		- t->next = t->next->next;
163		-
164		- spin_unlock_irqrestore(&irqlist_lock, flags);
165		-}
166		-
167		-int show_hp300_interrupts(struct seq_file p, void v)
168		-{
169		- return 0;
170		-}
171		-
172		-void __init hp300_init_IRQ(void)
173		-{
174		- spin_lock_init(&irqlist_lock);
175		-}
1		-extern void hp300_init_IRQ(void);
2		-extern void (hp300_handlers[8])(int, void , struct pt_regs *);
3		-extern void hp300_free_irq(unsigned int irq, void *dev_id);
4		-extern int hp300_request_irq(unsigned int irq,
5		- irqreturn_t (handler) (int, void , struct pt_regs *),
6		- unsigned long flags, const char devname, void dev_id);
7		-
8		-/* number of interrupts, includes 0 (what's that?) */
9		-#define HP300_NUM_IRQS 8
...	...	@@ -18,7 +18,6 @@
18	18	#include <asm/system.h>
19	19	#include <asm/traps.h>
20	20	#include <asm/blinken.h>
21		-#include "ints.h"
22	21
23	22	/* Clock hardware definitions */
24	23
...	...	@@ -71,7 +70,7 @@
71	70
72	71	asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
73	72
74		- cpu_request_irq(6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
	73	+ request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);
75	74
76	75	out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
77	76	out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */