Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 43 insertions, 0 deletions

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 13f22d1d0e8b..ff7af369f286 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 
 #include <asm/asm.h>
+#include <asm/asmmacro.h>
 #include <asm/cacheops.h>
 #include <asm/regdef.h>
 #include <asm/fpregdef.h>
@@ -122,6 +123,20 @@ handle_vcei:
         .set    pop
         END(except_vec3_r4000)
 
+        __FINIT
+
+        .align  5
+NESTED(handle_int, PT_SIZE, sp)
+        SAVE_ALL
+        CLI
+
+        PTR_LA  ra, ret_from_irq
+        move    a0, sp
+        j       plat_irq_dispatch
+        END(handle_int)
+
+        __INIT
+
 /*
  * Special interrupt vector for MIPS64 ISA & embedded MIPS processors.
  * This is a dedicated interrupt exception vector which reduces the
@@ -157,6 +172,15 @@ NESTED(except_vec_vi, 0, sp)
         SAVE_AT
         .set    push
         .set    noreorder
+#ifdef CONFIG_MIPS_MT_SMTC
+        /*
+         * To keep from blindly blocking *all* interrupts
+         * during service by SMTC kernel, we also want to
+         * pass the IM value to be cleared.
+         */
+EXPORT(except_vec_vi_mori)
+        ori     a0, $0, 0
+#endif /* CONFIG_MIPS_MT_SMTC */
 EXPORT(except_vec_vi_lui)
         lui     v0, 0           /* Patched */
         j       except_vec_vi_handler
@@ -173,6 +197,25 @@ EXPORT(except_vec_vi_end)
 NESTED(except_vec_vi_handler, 0, sp)
         SAVE_TEMP
         SAVE_STATIC
+#ifdef CONFIG_MIPS_MT_SMTC
+        /*
+         * SMTC has an interesting problem that interrupts are level-triggered,
+         * and the CLI macro will clear EXL, potentially causing a duplicate
+         * interrupt service invocation. So we need to clear the associated
+         * IM bit of Status prior to doing CLI, and restore it after the
+         * service routine has been invoked - we must assume that the
+         * service routine will have cleared the state, and any active
+         * level represents a new or otherwised unserviced event...
+         */
+        mfc0    t1, CP0_STATUS
+        and     t0, a0, t1
+        mfc0    t2, CP0_TCCONTEXT
+        or      t0, t0, t2
+        mtc0    t0, CP0_TCCONTEXT
+        xor     t1, t1, t0
+        mtc0    t1, CP0_STATUS
+        ehb
+#endif /* CONFIG_MIPS_MT_SMTC */
         CLI
         move    a0, sp
         jalr    v0