1 files changed, 10 insertions, 8 deletions

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 6caf8766b80f..0cae4595e985 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -19,7 +19,7 @@
 #include <asm/asmmacro-64.h>
 #endif
 
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         .macro  local_irq_enable reg=t0
         ei
         irq_enable_hazard
@@ -104,7 +104,8 @@
         .endm
 
         .macro  fpu_save_double thread status tmp
-#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2) || \
+                defined(CONFIG_CPU_MIPS32_R6)
         sll     \tmp, \status, 5
         bgez    \tmp, 10f
         fpu_save_16odd \thread
@@ -160,7 +161,8 @@
         .endm
 
         .macro  fpu_restore_double thread status tmp
-#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2) || \
+                defined(CONFIG_CPU_MIPS32_R6)
         sll     \tmp, \status, 5
         bgez    \tmp, 10f                               # 16 register mode?
 
@@ -170,16 +172,16 @@
         fpu_restore_16even \thread \tmp
         .endm
 
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         .macro  _EXT    rd, rs, p, s
         ext     \rd, \rs, \p, \s
         .endm
-#else /* !CONFIG_CPU_MIPSR2 */
+#else /* !CONFIG_CPU_MIPSR2 || !CONFIG_CPU_MIPSR6 */
         .macro  _EXT    rd, rs, p, s
         srl     \rd, \rs, \p
         andi    \rd, \rd, (1 << \s) - 1
         .endm
-#endif /* !CONFIG_CPU_MIPSR2 */
+#endif /* !CONFIG_CPU_MIPSR2 || !CONFIG_CPU_MIPSR6 */
 
 /*
  * Temporary until all gas have MT ASE support
@@ -304,7 +306,7 @@
         .set    push
         .set    noat
         SET_HARDFLOAT
-        add     $1, \base, \off
+        addu    $1, \base, \off
         .word   LDD_MSA_INSN | (\wd << 6)
         .set    pop
         .endm
@@ -313,7 +315,7 @@
         .set    push
         .set    noat
         SET_HARDFLOAT
-        add     $1, \base, \off
+        addu    $1, \base, \off
         .word   STD_MSA_INSN | (\wd << 6)
         .set    pop
         .endm