[MIPS] Rewrite all the assembler interrupt handlers to C.

Saves like 1,600 lines of code, is way easier to debug, compilers
frequently do a better job than the cut and paste type of handlers many
boards had.  And finally having all the stuff done in a single place
also means alot of bug potencial for the MT ASE is gone.

The only surviving handler in assembler is the DECstation one; I hope
Maciej will rewrite it.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 24 insertions, 112 deletions

diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
index 8fa126b296e1..9cb9535ebacb 100644
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@ -6,7 +6,7 @@
 # unless it's something special (ie not a .c file).
 #
 
-obj-y   += tx4927_prom.o tx4927_setup.o tx4927_irq.o tx4927_irq_handler.o
+obj-y   += tx4927_prom.o tx4927_setup.o tx4927_irq.o
 
 obj-$(CONFIG_TOSHIBA_FPCIB0)       += smsc_fdc37m81x.o
 obj-$(CONFIG_KGDB)                 += tx4927_dbgio.o
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index 5ab2e2b76018..8ca68015cf40 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -525,8 +525,6 @@ static void tx4927_irq_pic_end(unsigned int irq)
  */
 void __init tx4927_irq_init(void)
 {
-        extern asmlinkage void tx4927_irq_handler(void);
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "-\n");
 
         TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_cp0_init()\n");
@@ -535,16 +533,12 @@ void __init tx4927_irq_init(void)
         TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_pic_init()\n");
         tx4927_irq_pic_init();
 
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT,
-                           "=Calling set_except_vector(tx4927_irq_handler)\n");
-        set_except_vector(0, tx4927_irq_handler);
-
         TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n");
 
         return;
 }
 
-int tx4927_irq_nested(void)
+static int tx4927_irq_nested(void)
 {
         int sw_irq = 0;
         u32 level2;
@@ -582,3 +576,25 @@ int tx4927_irq_nested(void)
 
         return (sw_irq);
 }
+
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+{
+        unsigned int pending = read_c0_status() & read_c0_cause();
+
+        if (pending & STATUSF_IP7)                      /* cpu timer */
+                do_IRQ(TX4927_IRQ_CPU_TIMER, regs);
+        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
+                unsigned int irq = tx4927_irq_nested();
+
+                if (unlikely(irq == 0)) {
+                        spurious_interrupt(regs);
+                        return;
+                }
+                do_IRQ(irq, regs);
+        } else if (pending & STATUSF_IP0)               /* user line 0 */
+                do_IRQ(TX4927_IRQ_USER0, regs);
+        else if (pending & STATUSF_IP1)                 /* user line 1 */
+                do_IRQ(TX4927_IRQ_USER1, regs);
+        else
+                spurious_interrupt(regs);
+}
diff --git a/arch/mips/tx4927/common/tx4927_irq_handler.S b/arch/mips/tx4927/common/tx4927_irq_handler.S
deleted file mode 100644
index 0b2ea02574f2..000000000000
--- a/arch/mips/tx4927/common/tx4927_irq_handler.S
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * linux/arch/mips/tx4927/common/tx4927_irq_handler.S
- *
- * Primary interrupt handler for tx4927 based systems
- *
- * Author: MontaVista Software, Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *         source@mvista.com
- *
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/addrspace.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-#include <asm/tx4927/tx4927.h>
-
-                .align  5
-                NESTED(tx4927_irq_handler, PT_SIZE, sp)
-                SAVE_ALL
-                CLI
-                .set    at
-
-                mfc0    t0, CP0_CAUSE
-                mfc0    t1, CP0_STATUS
-                and     t0, t1
-
-                andi    t1, t0, STATUSF_IP7     /* cpu timer */
-                bnez    t1, ll_ip7
-
-                /* IP6..IP3 multiplexed -- do not use */
-
-                andi    t1, t0, STATUSF_IP2     /* tx4927 pic */
-                bnez    t1, ll_ip2
-
-                andi    t1, t0, STATUSF_IP0     /* user line 0 */
-                bnez    t1, ll_ip0
-
-                andi    t1, t0, STATUSF_IP1     /* user line 1 */
-                bnez    t1, ll_ip1
-
-                .set    reorder
-
-                /* wrong alarm or masked ... */
-                jal     spurious_interrupt
-                nop
-                j       ret_from_irq
-                END(tx4927_irq_handler)
-
-                .align  5
-
-
-ll_ip7:
-                li      a0, TX4927_IRQ_CPU_TIMER
-                move    a1, sp
-                jal     do_IRQ
-                j       ret_from_irq
-
-ll_ip2:
-                jal     tx4927_irq_nested
-                nop
-                beqz    v0, goto_spurious_interrupt
-                nop
-                move    a0, v0
-                move    a1, sp
-                jal     do_IRQ
-                j       ret_from_irq
-
-goto_spurious_interrupt:
-        j spurious_interrupt
-        nop
-
-ll_ip1:
-                li      a0, TX4927_IRQ_USER1
-                move    a1, sp
-                jal     do_IRQ
-                j       ret_from_irq
-
-ll_ip0:
-                li      a0, TX4927_IRQ_USER0
-                move    a1, sp
-                jal     do_IRQ
-                j       ret_from_irq