aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mvme16x
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:47:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:58 -0400
commit200a3d352cd5e0ae8fb96bfcf8103f7b7c60645b (patch)
treee9db90ac38cbfba0f4a4c541733fc4ebd09c5fd7 /arch/m68k/mvme16x
parentebba61d5b05ecfda388dd4c156bafdb78d398055 (diff)
[PATCH] m68k: convert VME 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>
Diffstat (limited to 'arch/m68k/mvme16x')
-rw-r--r--arch/m68k/mvme16x/16xints.c150
-rw-r--r--arch/m68k/mvme16x/Makefile2
-rw-r--r--arch/m68k/mvme16x/config.c23
3 files changed, 11 insertions, 164 deletions
diff --git a/arch/m68k/mvme16x/16xints.c b/arch/m68k/mvme16x/16xints.c
deleted file mode 100644
index 81afada90dd2..000000000000
--- a/arch/m68k/mvme16x/16xints.c
+++ /dev/null
@@ -1,150 +0,0 @@
1/*
2 * arch/m68k/mvme16x/16xints.c
3 *
4 * Copyright (C) 1995 Richard Hirst [richard@sleepie.demon.co.uk]
5 *
6 * based on amiints.c -- Amiga Linux interrupt handling code
7 *
8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file README.legal in the main directory of this archive
10 * for more details.
11 *
12 */
13
14#include <linux/types.h>
15#include <linux/kernel.h>
16#include <linux/errno.h>
17#include <linux/interrupt.h>
18#include <linux/seq_file.h>
19
20#include <asm/system.h>
21#include <asm/ptrace.h>
22#include <asm/irq.h>
23
24static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp);
25
26/*
27 * This should ideally be 4 elements only, for speed.
28 */
29
30static struct {
31 irqreturn_t (*handler)(int, void *, struct pt_regs *);
32 unsigned long flags;
33 void *dev_id;
34 const char *devname;
35 unsigned count;
36} irq_tab[192];
37
38/*
39 * void mvme16x_init_IRQ (void)
40 *
41 * Parameters: None
42 *
43 * Returns: Nothing
44 *
45 * This function is called during kernel startup to initialize
46 * the mvme16x IRQ handling routines. Should probably ensure
47 * that the base vectors for the VMEChip2 and PCCChip2 are valid.
48 */
49
50void mvme16x_init_IRQ (void)
51{
52 int i;
53
54 for (i = 0; i < 192; i++) {
55 irq_tab[i].handler = mvme16x_defhand;
56 irq_tab[i].flags = IRQ_FLG_STD;
57 irq_tab[i].dev_id = NULL;
58 irq_tab[i].devname = NULL;
59 irq_tab[i].count = 0;
60 }
61}
62
63int mvme16x_request_irq(unsigned int irq,
64 irqreturn_t (*handler)(int, void *, struct pt_regs *),
65 unsigned long flags, const char *devname, void *dev_id)
66{
67 if (irq < 64 || irq > 255) {
68 printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
69 return -ENXIO;
70 }
71
72 if (!(irq_tab[irq-64].flags & IRQ_FLG_STD)) {
73 if (irq_tab[irq-64].flags & IRQ_FLG_LOCK) {
74 printk("%s: IRQ %d from %s is not replaceable\n",
75 __FUNCTION__, irq, irq_tab[irq-64].devname);
76 return -EBUSY;
77 }
78 if (flags & IRQ_FLG_REPLACE) {
79 printk("%s: %s can't replace IRQ %d from %s\n",
80 __FUNCTION__, devname, irq, irq_tab[irq-64].devname);
81 return -EBUSY;
82 }
83 }
84 irq_tab[irq-64].handler = handler;
85 irq_tab[irq-64].flags = flags;
86 irq_tab[irq-64].dev_id = dev_id;
87 irq_tab[irq-64].devname = devname;
88 return 0;
89}
90
91void mvme16x_free_irq(unsigned int irq, void *dev_id)
92{
93 if (irq < 64 || irq > 255) {
94 printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
95 return;
96 }
97
98 if (irq_tab[irq-64].dev_id != dev_id)
99 printk("%s: Removing probably wrong IRQ %d from %s\n",
100 __FUNCTION__, irq, irq_tab[irq-64].devname);
101
102 irq_tab[irq-64].handler = mvme16x_defhand;
103 irq_tab[irq-64].flags = IRQ_FLG_STD;
104 irq_tab[irq-64].dev_id = NULL;
105 irq_tab[irq-64].devname = NULL;
106}
107
108irqreturn_t mvme16x_process_int (unsigned long vec, struct pt_regs *fp)
109{
110 if (vec < 64 || vec > 255) {
111 printk ("mvme16x_process_int: Illegal vector %ld", vec);
112 return IRQ_NONE;
113 } else {
114 irq_tab[vec-64].count++;
115 irq_tab[vec-64].handler(vec, irq_tab[vec-64].dev_id, fp);
116 return IRQ_HANDLED;
117 }
118}
119
120int show_mvme16x_interrupts (struct seq_file *p, void *v)
121{
122 int i;
123
124 for (i = 0; i < 192; i++) {
125 if (irq_tab[i].count)
126 seq_printf(p, "Vec 0x%02x: %8d %s\n",
127 i+64, irq_tab[i].count,
128 irq_tab[i].devname ? irq_tab[i].devname : "free");
129 }
130 return 0;
131}
132
133
134static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp)
135{
136 printk ("Unknown interrupt 0x%02x\n", irq);
137 return IRQ_NONE;
138}
139
140
141void mvme16x_enable_irq (unsigned int irq)
142{
143}
144
145
146void mvme16x_disable_irq (unsigned int irq)
147{
148}
149
150
diff --git a/arch/m68k/mvme16x/Makefile b/arch/m68k/mvme16x/Makefile
index 5129f56b64a3..950e82f21640 100644
--- a/arch/m68k/mvme16x/Makefile
+++ b/arch/m68k/mvme16x/Makefile
@@ -2,4 +2,4 @@
2# Makefile for Linux arch/m68k/mvme16x source directory 2# Makefile for Linux arch/m68k/mvme16x source directory
3# 3#
4 4
5obj-y := config.o 16xints.o rtc.o mvme16x_ksyms.o 5obj-y := config.o rtc.o mvme16x_ksyms.o
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 26ce81c1337d..ce2727ed1bc0 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -40,15 +40,8 @@ extern t_bdid mvme_bdid;
40 40
41static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; 41static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
42 42
43extern irqreturn_t mvme16x_process_int (int level, struct pt_regs *regs);
44extern void mvme16x_init_IRQ (void);
45extern void mvme16x_free_irq (unsigned int, void *);
46extern int show_mvme16x_interrupts (struct seq_file *, void *);
47extern void mvme16x_enable_irq (unsigned int);
48extern void mvme16x_disable_irq (unsigned int);
49static void mvme16x_get_model(char *model); 43static void mvme16x_get_model(char *model);
50static int mvme16x_get_hardware_list(char *buffer); 44static int mvme16x_get_hardware_list(char *buffer);
51extern int mvme16x_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);
52extern void mvme16x_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)); 45extern void mvme16x_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
53extern unsigned long mvme16x_gettimeoffset (void); 46extern unsigned long mvme16x_gettimeoffset (void);
54extern int mvme16x_hwclk (int, struct rtc_time *); 47extern int mvme16x_hwclk (int, struct rtc_time *);
@@ -120,6 +113,16 @@ static int mvme16x_get_hardware_list(char *buffer)
120 return (len); 113 return (len);
121} 114}
122 115
116/*
117 * This function is called during kernel startup to initialize
118 * the mvme16x IRQ handling routines. Should probably ensure
119 * that the base vectors for the VMEChip2 and PCCChip2 are valid.
120 */
121
122static void mvme16x_init_IRQ (void)
123{
124 m68k_setup_user_interrupt(VEC_USER, 192, NULL);
125}
123 126
124#define pcc2chip ((volatile u_char *)0xfff42000) 127#define pcc2chip ((volatile u_char *)0xfff42000)
125#define PccSCCMICR 0x1d 128#define PccSCCMICR 0x1d
@@ -138,12 +141,6 @@ void __init config_mvme16x(void)
138 mach_hwclk = mvme16x_hwclk; 141 mach_hwclk = mvme16x_hwclk;
139 mach_set_clock_mmss = mvme16x_set_clock_mmss; 142 mach_set_clock_mmss = mvme16x_set_clock_mmss;
140 mach_reset = mvme16x_reset; 143 mach_reset = mvme16x_reset;
141 mach_free_irq = mvme16x_free_irq;
142 mach_process_int = mvme16x_process_int;
143 mach_get_irq_list = show_mvme16x_interrupts;
144 mach_request_irq = mvme16x_request_irq;
145 enable_irq = mvme16x_enable_irq;
146 disable_irq = mvme16x_disable_irq;
147 mach_get_model = mvme16x_get_model; 144 mach_get_model = mvme16x_get_model;
148 mach_get_hardware_list = mvme16x_get_hardware_list; 145 mach_get_hardware_list = mvme16x_get_hardware_list;
149 146
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 10:27:53 -0500