aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/include/asm/irq.h3
-rw-r--r--arch/alpha/kernel/irq.c7
-rw-r--r--arch/alpha/kernel/irq_i8259.c3
-rw-r--r--arch/alpha/kernel/irq_pyxis.c4
-rw-r--r--arch/alpha/kernel/irq_srm.c4
-rw-r--r--arch/alpha/kernel/sys_alcor.c4
-rw-r--r--arch/alpha/kernel/sys_cabriolet.c5
-rw-r--r--arch/alpha/kernel/sys_dp264.c4
-rw-r--r--arch/alpha/kernel/sys_eb64p.c4
-rw-r--r--arch/alpha/kernel/sys_eiger.c4
-rw-r--r--arch/alpha/kernel/sys_jensen.c10
-rw-r--r--arch/alpha/kernel/sys_marvel.c12
-rw-r--r--arch/alpha/kernel/sys_mikasa.c4
-rw-r--r--arch/alpha/kernel/sys_noritake.c4
-rw-r--r--arch/alpha/kernel/sys_rawhide.c4
-rw-r--r--arch/alpha/kernel/sys_rx164.c4
-rw-r--r--arch/alpha/kernel/sys_sable.c5
-rw-r--r--arch/alpha/kernel/sys_takara.c4
-rw-r--r--arch/alpha/kernel/sys_titan.c4
-rw-r--r--arch/alpha/kernel/sys_wildfire.c14
20 files changed, 59 insertions, 48 deletions
diff --git a/arch/alpha/include/asm/irq.h b/arch/alpha/include/asm/irq.h
index 06377400dc09..4126441c8ef1 100644
--- a/arch/alpha/include/asm/irq.h
+++ b/arch/alpha/include/asm/irq.h
@@ -88,4 +88,7 @@ static __inline__ int irq_canonicalize(int irq)
88struct pt_regs; 88struct pt_regs;
89extern void (*perf_irq)(unsigned long, struct pt_regs *); 89extern void (*perf_irq)(unsigned long, struct pt_regs *);
90 90
91struct irq_desc;
92extern void alpha_do_IRQ(unsigned int irq, struct irq_desc *desc);
93
91#endif /* _ALPHA_IRQ_H */ 94#endif /* _ALPHA_IRQ_H */
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index fe912984d9b1..ecfa51eafd75 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -159,6 +159,11 @@ handle_irq(int irq)
159 * at IPL 0. 159 * at IPL 0.
160 */ 160 */
161 local_irq_disable(); 161 local_irq_disable();
162 __do_IRQ(irq); 162 generic_handle_irq(irq);
163 irq_exit(); 163 irq_exit();
164} 164}
165
166void alpha_do_IRQ(unsigned int irq, struct irq_desc *desc)
167{
168 __do_IRQ(irq);
169}
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index 83a9ac280890..39299fbb637c 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -107,8 +107,7 @@ init_i8259a_irqs(void)
107 outb(0xff, 0xA1); /* mask all of 8259A-2 */ 107 outb(0xff, 0xA1); /* mask all of 8259A-2 */
108 108
109 for (i = 0; i < 16; i++) { 109 for (i = 0; i < 16; i++) {
110 irq_desc[i].status = IRQ_DISABLED; 110 set_irq_chip_and_handler(i, &i8259a_irq_type, alpha_do_IRQ);
111 irq_desc[i].chip = &i8259a_irq_type;
112 } 111 }
113 112
114 setup_irq(2, &cascade); 113 setup_irq(2, &cascade);
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index 989ce46a0cf3..4e1904cd0fc0 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -119,8 +119,8 @@ init_pyxis_irqs(unsigned long ignore_mask)
119 for (i = 16; i < 48; ++i) { 119 for (i = 16; i < 48; ++i) {
120 if ((ignore_mask >> i) & 1) 120 if ((ignore_mask >> i) & 1)
121 continue; 121 continue;
122 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 122 set_irq_chip_and_handler(i, &pyxis_irq_type, alpha_do_IRQ);
123 irq_desc[i].chip = &pyxis_irq_type; 123 irq_desc[i].status |= IRQ_LEVEL;
124 } 124 }
125 125
126 setup_irq(16+7, &isa_cascade_irqaction); 126 setup_irq(16+7, &isa_cascade_irqaction);
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c
index d63e93e1e8bf..b337cfc9d6bb 100644
--- a/arch/alpha/kernel/irq_srm.c
+++ b/arch/alpha/kernel/irq_srm.c
@@ -68,8 +68,8 @@ init_srm_irqs(long max, unsigned long ignore_mask)
68 for (i = 16; i < max; ++i) { 68 for (i = 16; i < max; ++i) {
69 if (i < 64 && ((ignore_mask >> i) & 1)) 69 if (i < 64 && ((ignore_mask >> i) & 1))
70 continue; 70 continue;
71 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 71 irq_desc[i].status |= IRQ_LEVEL;
72 irq_desc[i].chip = &srm_irq_type; 72 set_irq_chip_and_handler(i, &srm_irq_type, alpha_do_IRQ);
73 } 73 }
74} 74}
75 75
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 20a30b8b9655..d8c918384f2d 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -142,8 +142,8 @@ alcor_init_irq(void)
142 on while IRQ probing. */ 142 on while IRQ probing. */
143 if (i >= 16+20 && i <= 16+30) 143 if (i >= 16+20 && i <= 16+30)
144 continue; 144 continue;
145 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 145 irq_desc[i].status |= IRQ_LEVEL;
146 irq_desc[i].chip = &alcor_irq_type; 146 set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ);
147 } 147 }
148 i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq; 148 i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
149 149
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 14c8898d19ec..ba38fcd347d6 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -122,8 +122,9 @@ common_init_irq(void (*srm_dev_int)(unsigned long v))
122 outb(0xff, 0x806); 122 outb(0xff, 0x806);
123 123
124 for (i = 16; i < 35; ++i) { 124 for (i = 16; i < 35; ++i) {
125 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 125 set_irq_chip_and_handler(i, &cabriolet_irq_type,
126 irq_desc[i].chip = &cabriolet_irq_type; 126 alpha_do_IRQ);
127 irq_desc[i].status |= IRQ_LEVEL;
127 } 128 }
128 } 129 }
129 130
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 4026502ab707..147154d372e0 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -302,8 +302,8 @@ init_tsunami_irqs(struct irq_chip * ops, int imin, int imax)
302{ 302{
303 long i; 303 long i;
304 for (i = imin; i <= imax; ++i) { 304 for (i = imin; i <= imax; ++i) {
305 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 305 irq_desc[i].status |= IRQ_LEVEL;
306 irq_desc[i].chip = ops; 306 set_irq_chip_and_handler(i, ops, alpha_do_IRQ);
307 } 307 }
308} 308}
309 309
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index df2090ce5e7f..cb309a422c01 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -135,8 +135,8 @@ eb64p_init_irq(void)
135 init_i8259a_irqs(); 135 init_i8259a_irqs();
136 136
137 for (i = 16; i < 32; ++i) { 137 for (i = 16; i < 32; ++i) {
138 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 138 irq_desc[i].status |= IRQ_LEVEL;
139 irq_desc[i].chip = &eb64p_irq_type; 139 set_irq_chip_and_handler(i, &eb64p_irq_type, alpha_do_IRQ);
140 } 140 }
141 141
142 common_init_isa_dma(); 142 common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 3ca1dbcf4044..16a5483cb753 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -153,8 +153,8 @@ eiger_init_irq(void)
153 init_i8259a_irqs(); 153 init_i8259a_irqs();
154 154
155 for (i = 16; i < 128; ++i) { 155 for (i = 16; i < 128; ++i) {
156 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 156 irq_desc[i].status |= IRQ_LEVEL;
157 irq_desc[i].chip = &eiger_irq_type; 157 set_irq_chip_and_handler(i, &eiger_irq_type, alpha_do_IRQ);
158 } 158 }
159} 159}
160 160
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index 7a7ae36fff91..5b64f913bedc 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -206,11 +206,11 @@ jensen_init_irq(void)
206{ 206{
207 init_i8259a_irqs(); 207 init_i8259a_irqs();
208 208
209 irq_desc[1].chip = &jensen_local_irq_type; 209 set_irq_chip_and_handler(1, &jensen_local_irq_type, alpha_do_IRQ);
210 irq_desc[4].chip = &jensen_local_irq_type; 210 set_irq_chip_and_handler(4, &jensen_local_irq_type, alpha_do_IRQ);
211 irq_desc[3].chip = &jensen_local_irq_type; 211 set_irq_chip_and_handler(3, &jensen_local_irq_type, alpha_do_IRQ);
212 irq_desc[7].chip = &jensen_local_irq_type; 212 set_irq_chip_and_handler(7, &jensen_local_irq_type, alpha_do_IRQ);
213 irq_desc[9].chip = &jensen_local_irq_type; 213 set_irq_chip_and_handler(9, &jensen_local_irq_type, alpha_do_IRQ);
214 214
215 common_init_isa_dma(); 215 common_init_isa_dma();
216} 216}
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 0bb3b5c4f693..0d0699eef08c 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -304,8 +304,8 @@ init_io7_irqs(struct io7 *io7,
304 304
305 /* Set up the lsi irqs. */ 305 /* Set up the lsi irqs. */
306 for (i = 0; i < 128; ++i) { 306 for (i = 0; i < 128; ++i) {
307 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL; 307 irq_desc[base + i].status |= IRQ_LEVEL;
308 irq_desc[base + i].chip = lsi_ops; 308 set_irq_chip_and_handler(base + i, lsi_ops, alpha_do_IRQ);
309 } 309 }
310 310
311 /* Disable the implemented irqs in hardware. */ 311 /* Disable the implemented irqs in hardware. */
@@ -318,8 +318,8 @@ init_io7_irqs(struct io7 *io7,
318 318
319 /* Set up the msi irqs. */ 319 /* Set up the msi irqs. */
320 for (i = 128; i < (128 + 512); ++i) { 320 for (i = 128; i < (128 + 512); ++i) {
321 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL; 321 irq_desc[base + i].status |= IRQ_LEVEL;
322 irq_desc[base + i].chip = msi_ops; 322 set_irq_chip_and_handler(base + i, msi_ops, alpha_do_IRQ);
323 } 323 }
324 324
325 for (i = 0; i < 16; ++i) 325 for (i = 0; i < 16; ++i)
@@ -336,8 +336,8 @@ marvel_init_irq(void)
336 336
337 /* Reserve the legacy irqs. */ 337 /* Reserve the legacy irqs. */
338 for (i = 0; i < 16; ++i) { 338 for (i = 0; i < 16; ++i) {
339 irq_desc[i].status = IRQ_DISABLED; 339 set_irq_chip_and_handler(i, &marvel_legacy_irq_type,
340 irq_desc[i].chip = &marvel_legacy_irq_type; 340 alpha_do_IRQ);
341 } 341 }
342 342
343 /* Init the io7 irqs. */ 343 /* Init the io7 irqs. */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index ee8865169811..a27bc56dddaf 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -115,8 +115,8 @@ mikasa_init_irq(void)
115 mikasa_update_irq_hw(0); 115 mikasa_update_irq_hw(0);
116 116
117 for (i = 16; i < 32; ++i) { 117 for (i = 16; i < 32; ++i) {
118 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 118 irq_desc[i].status |= IRQ_LEVEL;
119 irq_desc[i].chip = &mikasa_irq_type; 119 set_irq_chip_and_handler(i, &mikasa_irq_type, alpha_do_IRQ);
120 } 120 }
121 121
122 init_i8259a_irqs(); 122 init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 86503fe73a88..a4f07d6c9397 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -144,8 +144,8 @@ noritake_init_irq(void)
144 outw(0, 0x54c); 144 outw(0, 0x54c);
145 145
146 for (i = 16; i < 48; ++i) { 146 for (i = 16; i < 48; ++i) {
147 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 147 irq_desc[i].status |= IRQ_LEVEL;
148 irq_desc[i].chip = &noritake_irq_type; 148 set_irq_chip_and_handler(i, &noritake_irq_type, alpha_do_IRQ);
149 } 149 }
150 150
151 init_i8259a_irqs(); 151 init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 26c322bf89ee..a63da5c6eb88 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -194,8 +194,8 @@ rawhide_init_irq(void)
194 } 194 }
195 195
196 for (i = 16; i < 128; ++i) { 196 for (i = 16; i < 128; ++i) {
197 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 197 irq_desc[i].status |= IRQ_LEVEL;
198 irq_desc[i].chip = &rawhide_irq_type; 198 set_irq_chip_and_handler(i, &rawhide_irq_type, alpha_do_IRQ);
199 } 199 }
200 200
201 init_i8259a_irqs(); 201 init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index be161129eab9..0465716d3433 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -116,8 +116,8 @@ rx164_init_irq(void)
116 116
117 rx164_update_irq_hw(0); 117 rx164_update_irq_hw(0);
118 for (i = 16; i < 40; ++i) { 118 for (i = 16; i < 40; ++i) {
119 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 119 irq_desc[i].status |= IRQ_LEVEL;
120 irq_desc[i].chip = &rx164_irq_type; 120 set_irq_chip_and_handler(i, &rx164_irq_type, alpha_do_IRQ);
121 } 121 }
122 122
123 init_i8259a_irqs(); 123 init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index b2abe27a23cf..944b598b80e6 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -535,8 +535,9 @@ sable_lynx_init_irq(int nr_of_irqs)
535 long i; 535 long i;
536 536
537 for (i = 0; i < nr_of_irqs; ++i) { 537 for (i = 0; i < nr_of_irqs; ++i) {
538 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 538 irq_desc[i].status |= IRQ_LEVEL;
539 irq_desc[i].chip = &sable_lynx_irq_type; 539 set_irq_chip_and_handler(i, &sable_lynx_irq_type,
540 alpha_do_IRQ);
540 } 541 }
541 542
542 common_init_isa_dma(); 543 common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 4da596b6adbb..00df4e7b8d7d 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -153,8 +153,8 @@ takara_init_irq(void)
153 takara_update_irq_hw(i, -1); 153 takara_update_irq_hw(i, -1);
154 154
155 for (i = 16; i < 128; ++i) { 155 for (i = 16; i < 128; ++i) {
156 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 156 irq_desc[i].status |= IRQ_LEVEL;
157 irq_desc[i].chip = &takara_irq_type; 157 set_irq_chip_and_handler(i, &takara_irq_type, alpha_do_IRQ);
158 } 158 }
159 159
160 common_init_isa_dma(); 160 common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 9008d0f20c53..ffa48e8a27c7 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -189,8 +189,8 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax)
189{ 189{
190 long i; 190 long i;
191 for (i = imin; i <= imax; ++i) { 191 for (i = imin; i <= imax; ++i) {
192 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 192 irq_desc[i].status |= IRQ_LEVEL;
193 irq_desc[i].chip = ops; 193 set_irq_chip_and_handler(i, ops, alpha_do_IRQ);
194 } 194 }
195} 195}
196 196
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 62fd972e18ef..ea86103f53c3 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -198,15 +198,17 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)
198 for (i = 0; i < 16; ++i) { 198 for (i = 0; i < 16; ++i) {
199 if (i == 2) 199 if (i == 2)
200 continue; 200 continue;
201 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; 201 irq_desc[i+irq_bias].status |= IRQ_LEVEL;
202 irq_desc[i+irq_bias].chip = &wildfire_irq_type; 202 set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
203 alpha_do_IRQ);
203 } 204 }
204 205
205 irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; 206 irq_desc[36+irq_bias].status |= IRQ_LEVEL;
206 irq_desc[36+irq_bias].chip = &wildfire_irq_type; 207 set_irq_chip_and_handler(36+irq_bias, &wildfire_irq_type, alpha_do_IRQ);
207 for (i = 40; i < 64; ++i) { 208 for (i = 40; i < 64; ++i) {
208 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; 209 irq_desc[i+irq_bias].status |= IRQ_LEVEL;
209 irq_desc[i+irq_bias].chip = &wildfire_irq_type; 210 set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
211 alpha_do_IRQ);
210 } 212 }
211 213
212 setup_irq(32+irq_bias, &isa_enable); 214 setup_irq(32+irq_bias, &isa_enable);