1 diff -Nur linux-2.6.15/arch/mips/aruba/idtIRQ.S linux-2.6.15-openwrt/arch/mips/aruba/idtIRQ.S
2 --- linux-2.6.15/arch/mips/aruba/idtIRQ.S 1970-01-01 01:00:00.000000000 +0100
3 +++ linux-2.6.15-openwrt/arch/mips/aruba/idtIRQ.S 2006-01-10 00:32:32.000000000 +0100
5 +/**************************************************************************
7 + * BRIEF MODULE DESCRIPTION
8 + * Intterrupt dispatcher code for IDT boards
10 + * Copyright 2004 IDT Inc. (rischelp@idt.com)
12 + * This program is free software; you can redistribute it and/or modify it
13 + * under the terms of the GNU General Public License as published by the
14 + * Free Software Foundation; either version 2 of the License, or (at your
15 + * option) any later version.
17 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
19 + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
20 + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24 + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 + * You should have received a copy of the GNU General Public License along
29 + * with this program; if not, write to the Free Software Foundation, Inc.,
30 + * 675 Mass Ave, Cambridge, MA 02139, USA.
33 + **************************************************************************
40 + **************************************************************************
45 +#include <asm/mipsregs.h>
46 +#include <asm/regdef.h>
47 +#include <asm/stackframe.h>
53 + NESTED(idtIRQ, PT_SIZE, sp)
61 + /* Get the pending interrupts */
65 + /* Isolate the allowed ones by anding the irq mask */
67 + move a1, sp /* need a nop here, hence we anticipate */
71 + /* check for r4k counter/timer IRQ. */
73 + andi t1, t0, CAUSEF_IP7
77 + jal aruba_timer_interrupt
84 + jal aruba_irqdispatch
92 diff -Nur linux-2.6.15/arch/mips/aruba/irq.c linux-2.6.15-openwrt/arch/mips/aruba/irq.c
93 --- linux-2.6.15/arch/mips/aruba/irq.c 1970-01-01 01:00:00.000000000 +0100
94 +++ linux-2.6.15-openwrt/arch/mips/aruba/irq.c 2006-01-10 00:32:32.000000000 +0100
96 +/**************************************************************************
98 + * BRIEF MODULE DESCRIPTION
99 + * Interrupt routines for IDT EB434 boards
101 + * Copyright 2004 IDT Inc. (rischelp@idt.com)
103 + * This program is free software; you can redistribute it and/or modify it
104 + * under the terms of the GNU General Public License as published by the
105 + * Free Software Foundation; either version 2 of the License, or (at your
106 + * option) any later version.
108 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
109 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
110 + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
111 + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
112 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
113 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
114 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
115 + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
116 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
117 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
119 + * You should have received a copy of the GNU General Public License along
120 + * with this program; if not, write to the Free Software Foundation, Inc.,
121 + * 675 Mass Ave, Cambridge, MA 02139, USA.
124 + **************************************************************************
125 + * May 2004 rkt, neb
131 + **************************************************************************
134 +#include <linux/errno.h>
135 +#include <linux/init.h>
136 +#include <linux/kernel_stat.h>
137 +#include <linux/module.h>
138 +#include <linux/signal.h>
139 +#include <linux/sched.h>
140 +#include <linux/types.h>
141 +#include <linux/interrupt.h>
142 +#include <linux/ioport.h>
143 +#include <linux/timex.h>
144 +#include <linux/slab.h>
145 +#include <linux/random.h>
146 +#include <linux/delay.h>
148 +#include <asm/bitops.h>
149 +#include <asm/bootinfo.h>
151 +#include <asm/mipsregs.h>
152 +#include <asm/system.h>
153 +#include <asm/idt-boards/rc32434/rc32434.h>
154 +#include <asm/idt-boards/rc32434/rc32434_gpio.h>
156 +#include <asm/irq.h>
160 +/* note: prints function name for you */
161 +#define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args)
163 +#define DPRINTK(fmt, args...)
166 +extern asmlinkage void idtIRQ(void);
167 +static unsigned int startup_irq(unsigned int irq);
168 +static void end_irq(unsigned int irq_nr);
169 +static void mask_and_ack_irq(unsigned int irq_nr);
170 +static void aruba_enable_irq(unsigned int irq_nr);
171 +static void aruba_disable_irq(unsigned int irq_nr);
173 +extern void __init init_generic_irq(void);
177 + volatile u32 *base_addr;
180 +static const intr_group_t intr_group_merlot[NUM_INTR_GROUPS] = {
181 + {0xffffffff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 0)},
184 +#define READ_PEND_MERLOT(base) (*((volatile unsigned long *)(0xbc003010)))
185 +#define READ_MASK_MERLOT(base) (*((volatile unsigned long *)(0xbc003010 + 4)))
186 +#define WRITE_MASK_MERLOT(base, val) ((*((volatile unsigned long *)((0xbc003010) + 4))) = (val))
188 +static const intr_group_t intr_group_muscat[NUM_INTR_GROUPS] = {
189 + {0x0000efff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 0 * IC_GROUP_OFFSET)},
190 + {0x00001fff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 1 * IC_GROUP_OFFSET)},
191 + {0x00000007, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 2 * IC_GROUP_OFFSET)},
192 + {0x0003ffff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 3 * IC_GROUP_OFFSET)},
193 + {0xffffffff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 4 * IC_GROUP_OFFSET)}
196 +#define READ_PEND_MUSCAT(base) (*(base))
197 +#define READ_MASK_MUSCAT(base) (*(base + 2))
198 +#define WRITE_MASK_MUSCAT(base, val) (*(base + 2) = (val))
200 +static inline int irq_to_group(unsigned int irq_nr)
202 + switch (mips_machtype) {
203 + case MACH_ARUBA_AP70:
204 + return ((irq_nr - GROUP0_IRQ_BASE) >> 5);
205 + case MACH_ARUBA_AP65:
206 + case MACH_ARUBA_AP60:
212 +static inline int group_to_ip(unsigned int group)
214 + switch (mips_machtype) {
215 + case MACH_ARUBA_AP70:
217 + case MACH_ARUBA_AP65:
218 + case MACH_ARUBA_AP60:
224 +static inline void enable_local_irq(unsigned int ip)
226 + int ipnum = 0x100 << ip;
227 + clear_c0_cause(ipnum);
228 + set_c0_status(ipnum);
231 +static inline void disable_local_irq(unsigned int ip)
233 + int ipnum = 0x100 << ip;
234 + clear_c0_status(ipnum);
237 +static inline void ack_local_irq(unsigned int ip)
239 + int ipnum = 0x100 << ip;
240 + clear_c0_cause(ipnum);
243 +static void aruba_enable_irq(unsigned int irq_nr)
245 + int ip = irq_nr - GROUP0_IRQ_BASE;
246 + unsigned int group, intr_bit;
247 + volatile unsigned int *addr;
249 + enable_local_irq(irq_nr);
252 + switch (mips_machtype) {
253 + case MACH_ARUBA_AP70:
256 + case MACH_ARUBA_AP65:
257 + case MACH_ARUBA_AP60:
263 + // calc interrupt bit within group
264 + ip -= (group << 5);
265 + intr_bit = 1 << ip;
267 + // first enable the IP mapped to this IRQ
268 + enable_local_irq(group_to_ip(group));
270 + switch (mips_machtype) {
271 + case MACH_ARUBA_AP70:
272 + addr = intr_group_muscat[group].base_addr;
273 + // unmask intr within group
274 + WRITE_MASK_MUSCAT(addr, READ_MASK_MUSCAT(addr) & ~intr_bit);
276 + case MACH_ARUBA_AP65:
277 + case MACH_ARUBA_AP60:
279 + addr = intr_group_merlot[group].base_addr;
280 + WRITE_MASK_MERLOT(addr, READ_MASK_MERLOT(addr) | intr_bit);
286 +static void aruba_disable_irq(unsigned int irq_nr)
288 + int ip = irq_nr - GROUP0_IRQ_BASE;
289 + unsigned int group, intr_bit, mask;
290 + volatile unsigned int *addr;
293 + switch (mips_machtype) {
294 + case MACH_ARUBA_AP70:
297 + case MACH_ARUBA_AP65:
298 + case MACH_ARUBA_AP60:
304 + // calc interrupt bit within group
306 + intr_bit = 1 << ip;
308 + switch (mips_machtype) {
309 + case MACH_ARUBA_AP70:
310 + addr = intr_group_muscat[group].base_addr;
311 + // mask intr within group
312 + mask = READ_MASK_MUSCAT(addr);
314 + WRITE_MASK_MUSCAT(addr, mask);
317 + if there are no more interrupts enabled in this
318 + group, disable corresponding IP
320 + if (mask == intr_group_muscat[group].mask)
321 + disable_local_irq(group_to_ip(group));
323 + case MACH_ARUBA_AP65:
324 + case MACH_ARUBA_AP60:
326 + addr = intr_group_merlot[group].base_addr;
327 + // mask intr within group
328 + mask = READ_MASK_MERLOT(addr);
330 + WRITE_MASK_MERLOT(addr, mask);
332 + disable_local_irq(group_to_ip(group));
337 +static unsigned int startup_irq(unsigned int irq_nr)
339 + aruba_enable_irq(irq_nr);
343 +static void shutdown_irq(unsigned int irq_nr)
345 + aruba_disable_irq(irq_nr);
349 +static void mask_and_ack_irq(unsigned int irq_nr)
351 + aruba_disable_irq(irq_nr);
352 + ack_local_irq(group_to_ip(irq_to_group(irq_nr)));
355 +static void end_irq(unsigned int irq_nr)
358 + int ip = irq_nr - GROUP0_IRQ_BASE;
359 + unsigned int intr_bit, group;
360 + volatile unsigned int *addr;
362 + if (irq_desc[irq_nr].status & (IRQ_DISABLED | IRQ_INPROGRESS)) {
363 + printk("warning: end_irq %d did not enable (%x)\n",
364 + irq_nr, irq_desc[irq_nr].status);
367 + switch (mips_machtype) {
368 + case MACH_ARUBA_AP70:
369 + if (irq_nr == GROUP4_IRQ_BASE + 9) idt_gpio->gpioistat &= 0xfffffdff;
370 + else if (irq_nr == GROUP4_IRQ_BASE + 10) idt_gpio->gpioistat &= 0xfffffbff;
371 + else if (irq_nr == GROUP4_IRQ_BASE + 11) idt_gpio->gpioistat &= 0xfffff7ff;
372 + else if (irq_nr == GROUP4_IRQ_BASE + 12) idt_gpio->gpioistat &= 0xffffefff;
376 + // calc interrupt bit within group
377 + ip -= (group << 5);
378 + intr_bit = 1 << ip;
380 + // first enable the IP mapped to this IRQ
381 + enable_local_irq(group_to_ip(group));
383 + addr = intr_group_muscat[group].base_addr;
384 + // unmask intr within group
385 + WRITE_MASK_MUSCAT(addr, READ_MASK_MUSCAT(addr) & ~intr_bit);
387 + case MACH_ARUBA_AP65:
388 + case MACH_ARUBA_AP60:
391 + // calc interrupt bit within group
392 + intr_bit = 1 << ip;
394 + // first enable the IP mapped to this IRQ
395 + enable_local_irq(group_to_ip(group));
397 + addr = intr_group_merlot[group].base_addr;
398 + // unmask intr within group
399 + WRITE_MASK_MERLOT(addr, READ_MASK_MERLOT(addr) | intr_bit);
404 +static struct hw_interrupt_type aruba_irq_type = {
405 + .typename = "IDT434",
406 + .startup = startup_irq,
407 + .shutdown = shutdown_irq,
408 + .enable = aruba_enable_irq,
409 + .disable = aruba_disable_irq,
410 + .ack = mask_and_ack_irq,
414 +void __init arch_init_irq(void)
417 + printk("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS);
418 + memset(irq_desc, 0, sizeof(irq_desc));
419 + set_except_vector(0, idtIRQ);
421 + for (i = 0; i < RC32434_NR_IRQS; i++) {
422 + irq_desc[i].status = IRQ_DISABLED;
423 + irq_desc[i].action = NULL;
424 + irq_desc[i].depth = 1;
425 + irq_desc[i].handler = &aruba_irq_type;
426 + spin_lock_init(&irq_desc[i].lock);
429 + switch (mips_machtype) {
430 + case MACH_ARUBA_AP70:
432 + case MACH_ARUBA_AP65:
433 + case MACH_ARUBA_AP60:
435 + WRITE_MASK_MERLOT(intr_group_merlot[0].base_addr, 0);
436 + *((volatile unsigned long *)0xbc003014) = 0x10;
441 +/* Main Interrupt dispatcher */
442 +void aruba_irqdispatch(unsigned long cp0_cause, struct pt_regs *regs)
444 + unsigned int pend, group, ip;
445 + volatile unsigned int *addr;
446 + switch (mips_machtype) {
447 + case MACH_ARUBA_AP70:
448 + if ((ip = (cp0_cause & 0x7c00))) {
449 + group = 21 - rc32434_clz(ip);
451 + addr = intr_group_muscat[group].base_addr;
453 + pend = READ_PEND_MUSCAT(addr);
454 + pend &= ~READ_MASK_MUSCAT(addr); // only unmasked interrupts
455 + pend = 39 - rc32434_clz(pend);
456 + do_IRQ((group << 5) + pend, regs);
459 + case MACH_ARUBA_AP65:
460 + case MACH_ARUBA_AP60:
462 + if (cp0_cause & 0x4000) {
465 + addr = intr_group_merlot[group].base_addr;
466 + pend = READ_PEND_MERLOT(addr);
467 + pend &= READ_MASK_MERLOT(addr); // only unmasked interrupts
468 + /* handle one misc interrupt at a time */
470 + unsigned int intr_bit, irq_nr;
471 + intr_bit = pend ^ (pend - 1);
472 + irq_nr = ((31 - rc32434_clz(pend)) + GROUP0_IRQ_BASE);
473 + do_IRQ(irq_nr, regs);
477 + if (cp0_cause & 0x3c00) {
478 + while (cp0_cause) {
479 + unsigned int intr_bit, irq_nr;
480 + intr_bit = cp0_cause ^ (cp0_cause - 1);
481 + irq_nr = ((31 - rc32434_clz(cp0_cause)) - GROUP0_IRQ_BASE);
482 + do_IRQ(irq_nr, regs);
483 + cp0_cause &= ~intr_bit;