diff options
Diffstat (limited to 'arch/mips/momentum/jaguar_atx')
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/int-handler.S | 128 | ||||
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/irq.c | 35 |
3 files changed, 32 insertions, 133 deletions
diff --git a/arch/mips/momentum/jaguar_atx/Makefile b/arch/mips/momentum/jaguar_atx/Makefile index 20bbd3ea44a8..67372f3f9654 100644 --- a/arch/mips/momentum/jaguar_atx/Makefile +++ b/arch/mips/momentum/jaguar_atx/Makefile | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | # unless it's something special (ie not a .c file). | 6 | # unless it's something special (ie not a .c file). |
| 7 | # | 7 | # |
| 8 | 8 | ||
| 9 | obj-y += int-handler.o irq.o prom.o reset.o setup.o | 9 | obj-y += irq.o prom.o reset.o setup.o |
| 10 | 10 | ||
| 11 | obj-$(CONFIG_SERIAL_8250_CONSOLE) += ja-console.o | 11 | obj-$(CONFIG_SERIAL_8250_CONSOLE) += ja-console.o |
| 12 | obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o | 12 | obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o |
diff --git a/arch/mips/momentum/jaguar_atx/int-handler.S b/arch/mips/momentum/jaguar_atx/int-handler.S deleted file mode 100644 index 55bc789733f2..000000000000 --- a/arch/mips/momentum/jaguar_atx/int-handler.S +++ /dev/null | |||
| @@ -1,128 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2002 Momentum Computer Inc. | ||
| 3 | * Author: Matthew Dharm <mdharm@momenco.com> | ||
| 4 | * | ||
| 5 | * Based on work: | ||
| 6 | * Copyright 2001 MontaVista Software Inc. | ||
| 7 | * Author: jsun@mvista.com or jsun@junsun.net | ||
| 8 | * | ||
| 9 | * First-level interrupt dispatcher for Jaguar-ATX board. | ||
| 10 | * | ||
| 11 | * This program is free software; you can redistribute it and/or modify it | ||
| 12 | * under the terms of the GNU General Public License as published by the | ||
| 13 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 14 | * option) any later version. | ||
| 15 | */ | ||
| 16 | #include <asm/asm.h> | ||
| 17 | #include <asm/mipsregs.h> | ||
| 18 | #include <asm/addrspace.h> | ||
| 19 | #include <asm/regdef.h> | ||
| 20 | #include <asm/stackframe.h> | ||
| 21 | |||
| 22 | /* | ||
| 23 | * First level interrupt dispatcher for Ocelot-CS board | ||
| 24 | */ | ||
| 25 | .align 5 | ||
| 26 | NESTED(jaguar_handle_int, PT_SIZE, sp) | ||
| 27 | SAVE_ALL | ||
| 28 | CLI | ||
| 29 | .set at | ||
| 30 | mfc0 t0, CP0_CAUSE | ||
| 31 | mfc0 t2, CP0_STATUS | ||
| 32 | |||
| 33 | and t0, t2 | ||
| 34 | |||
| 35 | andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ | ||
| 36 | bnez t1, ll_sw0_irq | ||
| 37 | andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ | ||
| 38 | bnez t1, ll_sw1_irq | ||
| 39 | andi t1, t0, STATUSF_IP2 /* int0 hardware line */ | ||
| 40 | bnez t1, ll_pcixa_irq | ||
| 41 | andi t1, t0, STATUSF_IP3 /* int1 hardware line */ | ||
| 42 | bnez t1, ll_pcixb_irq | ||
| 43 | andi t1, t0, STATUSF_IP4 /* int2 hardware line */ | ||
| 44 | bnez t1, ll_pcia_irq | ||
| 45 | andi t1, t0, STATUSF_IP5 /* int3 hardware line */ | ||
| 46 | bnez t1, ll_pcib_irq | ||
| 47 | andi t1, t0, STATUSF_IP6 /* int4 hardware line */ | ||
| 48 | bnez t1, ll_uart_irq | ||
| 49 | andi t1, t0, STATUSF_IP7 /* cpu timer */ | ||
| 50 | bnez t1, ll_cputimer_irq | ||
| 51 | |||
| 52 | nop | ||
| 53 | nop | ||
| 54 | |||
| 55 | /* now look at extended interrupts */ | ||
| 56 | mfc0 t0, CP0_CAUSE | ||
| 57 | cfc0 t1, CP0_S1_INTCONTROL | ||
| 58 | |||
| 59 | /* shift the mask 8 bits left to line up the bits */ | ||
| 60 | sll t2, t1, 8 | ||
| 61 | |||
| 62 | and t0, t2 | ||
| 63 | srl t0, t0, 16 | ||
| 64 | |||
| 65 | andi t1, t0, STATUSF_IP8 /* int6 hardware line */ | ||
| 66 | bnez t1, ll_mv64340_decode_irq | ||
| 67 | |||
| 68 | nop | ||
| 69 | nop | ||
| 70 | |||
| 71 | .set reorder | ||
| 72 | |||
| 73 | /* wrong alarm or masked ... */ | ||
| 74 | j spurious_interrupt | ||
| 75 | nop | ||
| 76 | END(jaguar_handle_int) | ||
| 77 | |||
| 78 | .align 5 | ||
| 79 | ll_sw0_irq: | ||
| 80 | li a0, 0 | ||
| 81 | move a1, sp | ||
| 82 | jal do_IRQ | ||
| 83 | j ret_from_irq | ||
| 84 | ll_sw1_irq: | ||
| 85 | li a0, 1 | ||
| 86 | move a1, sp | ||
| 87 | jal do_IRQ | ||
| 88 | j ret_from_irq | ||
| 89 | ll_pcixa_irq: | ||
| 90 | li a0, 2 | ||
| 91 | move a1, sp | ||
| 92 | jal do_IRQ | ||
| 93 | j ret_from_irq | ||
| 94 | |||
| 95 | ll_pcixb_irq: | ||
| 96 | li a0, 3 | ||
| 97 | move a1, sp | ||
| 98 | jal do_IRQ | ||
| 99 | j ret_from_irq | ||
| 100 | |||
| 101 | ll_pcia_irq: | ||
| 102 | li a0, 4 | ||
| 103 | move a1, sp | ||
| 104 | jal do_IRQ | ||
| 105 | j ret_from_irq | ||
| 106 | |||
| 107 | ll_pcib_irq: | ||
| 108 | li a0, 5 | ||
| 109 | move a1, sp | ||
| 110 | jal do_IRQ | ||
| 111 | j ret_from_irq | ||
| 112 | |||
| 113 | ll_uart_irq: | ||
| 114 | li a0, 6 | ||
| 115 | move a1, sp | ||
| 116 | jal do_IRQ | ||
| 117 | j ret_from_irq | ||
| 118 | |||
| 119 | ll_cputimer_irq: | ||
| 120 | li a0, 7 | ||
| 121 | move a1, sp | ||
| 122 | jal ll_timer_interrupt | ||
| 123 | j ret_from_irq | ||
| 124 | |||
| 125 | ll_mv64340_decode_irq: | ||
| 126 | move a0, sp | ||
| 127 | jal ll_mv64340_irq | ||
| 128 | j ret_from_irq | ||
diff --git a/arch/mips/momentum/jaguar_atx/irq.c b/arch/mips/momentum/jaguar_atx/irq.c index 15588f91ace2..ec4032b38f19 100644 --- a/arch/mips/momentum/jaguar_atx/irq.c +++ b/arch/mips/momentum/jaguar_atx/irq.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * Copyright 2001 MontaVista Software Inc. | 10 | * Copyright 2001 MontaVista Software Inc. |
| 11 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net | 11 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net |
| 12 | * | 12 | * |
| 13 | * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org) | 13 | * Copyright (C) 2000, 01, 06 Ralf Baechle (ralf@linux-mips.org) |
| 14 | * | 14 | * |
| 15 | * This program is free software; you can redistribute it and/or modify it | 15 | * This program is free software; you can redistribute it and/or modify it |
| 16 | * under the terms of the GNU General Public License as published by the | 16 | * under the terms of the GNU General Public License as published by the |
| @@ -38,8 +38,37 @@ | |||
| 38 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 39 | #include <asm/irq_cpu.h> | 39 | #include <asm/irq_cpu.h> |
| 40 | #include <asm/mipsregs.h> | 40 | #include <asm/mipsregs.h> |
| 41 | #include <asm/time.h> | ||
| 41 | 42 | ||
| 42 | extern asmlinkage void jaguar_handle_int(void); | 43 | asmlinkage void plat_irq_dispatch(struct pt_regs *regs) |
| 44 | { | ||
| 45 | unsigned int pending = read_c0_cause() & read_c0_status(); | ||
| 46 | |||
| 47 | if (pending & STATUSF_IP0) | ||
| 48 | do_IRQ(0, regs); | ||
| 49 | else if (pending & STATUSF_IP1) | ||
| 50 | do_IRQ(1, regs); | ||
| 51 | else if (pending & STATUSF_IP2) | ||
| 52 | do_IRQ(2, regs); | ||
| 53 | else if (pending & STATUSF_IP3) | ||
| 54 | do_IRQ(3, regs); | ||
| 55 | else if (pending & STATUSF_IP4) | ||
| 56 | do_IRQ(4, regs); | ||
| 57 | else if (pending & STATUSF_IP5) | ||
| 58 | do_IRQ(5, regs); | ||
| 59 | else if (pending & STATUSF_IP6) | ||
| 60 | do_IRQ(6, regs); | ||
| 61 | else if (pending & STATUSF_IP7) | ||
| 62 | ll_timer_interrupt(7, regs); | ||
| 63 | else { | ||
| 64 | /* | ||
| 65 | * Now look at the extended interrupts | ||
| 66 | */ | ||
| 67 | pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16; | ||
| 68 | if (pending & STATUSF_IP8) | ||
| 69 | ll_mv64340_irq(regs); | ||
| 70 | } | ||
| 71 | } | ||
| 43 | 72 | ||
| 44 | static struct irqaction cascade_mv64340 = { | 73 | static struct irqaction cascade_mv64340 = { |
| 45 | no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL | 74 | no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL |
| @@ -53,8 +82,6 @@ void __init arch_init_irq(void) | |||
| 53 | */ | 82 | */ |
| 54 | clear_c0_status(ST0_IM); | 83 | clear_c0_status(ST0_IM); |
| 55 | 84 | ||
| 56 | /* Sets the first-level interrupt dispatcher. */ | ||
| 57 | set_except_vector(0, jaguar_handle_int); | ||
| 58 | mips_cpu_irq_init(0); | 85 | mips_cpu_irq_init(0); |
| 59 | rm7k_cpu_irq_init(8); | 86 | rm7k_cpu_irq_init(8); |
| 60 | 87 | ||
