Merge branch 'upstream' into max-sect

1 files changed, 23 insertions, 1 deletions

diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 235ad9f6bd35..10f28fb9f008 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -283,11 +283,33 @@
  */
 
 3:
+#ifdef CONFIG_MIPS_MT_SMTC
+                /* Read-modify write of Status must be atomic */
+                mfc0    t2, CP0_TCSTATUS
+                ori     t1, t2, TCSTATUS_IXMT
+                mtc0    t1, CP0_TCSTATUS
+                andi    t2, t2, TCSTATUS_IXMT
+                ehb
+                DMT     9                               # dmt   t1
+                jal     mips_ihb
+                nop
+#endif /* CONFIG_MIPS_MT_SMTC */
                 mfc0    t0, CP0_STATUS
                 ori     t0, 0x1f
                 xori    t0, 0x1f
                 mtc0    t0, CP0_STATUS
-
+#ifdef CONFIG_MIPS_MT_SMTC
+                andi    t1, t1, VPECONTROL_TE
+                beqz    t1, 9f
+                nop
+                EMT                                     # emt
+9:
+                mfc0    t1, CP0_TCSTATUS
+                xori    t1, t1, TCSTATUS_IXMT
+                or      t1, t1, t2
+                mtc0    t1, CP0_TCSTATUS
+                ehb
+#endif /* CONFIG_MIPS_MT_SMTC */
                 LONG_L  v0, GDB_FR_STATUS(sp)
                 LONG_L  v1, GDB_FR_EPC(sp)
                 mtc0    v0, CP0_STATUS