1 files changed, 31 insertions, 0 deletions

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 935543f14538..cd9a98bc8f60 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -10,6 +10,7 @@
 
 #include <asm/hazards.h>
 #include <asm/asm-offsets.h>
+#include <asm/msa.h>
 
 #ifdef CONFIG_32BIT
 #include <asm/asmmacro-32.h>
@@ -378,9 +379,19 @@
         st_d    29, THREAD_FPR29, \thread
         st_d    30, THREAD_FPR30, \thread
         st_d    31, THREAD_FPR31, \thread
+        .set    push
+        .set    noat
+        cfcmsa  $1, MSA_CSR
+        sw      $1, THREAD_MSA_CSR(\thread)
+        .set    pop
         .endm
 
         .macro  msa_restore_all thread
+        .set    push
+        .set    noat
+        lw      $1, THREAD_MSA_CSR(\thread)
+        ctcmsa  MSA_CSR, $1
+        .set    pop
         ld_d    0, THREAD_FPR0, \thread
         ld_d    1, THREAD_FPR1, \thread
         ld_d    2, THREAD_FPR2, \thread
@@ -415,4 +426,24 @@
         ld_d    31, THREAD_FPR31, \thread
         .endm
 
+        .macro  msa_init_upper wd
+#ifdef CONFIG_64BIT
+        insert_d \wd, 1
+#else
+        insert_w \wd, 2
+        insert_w \wd, 3
+#endif
+        .if     31-\wd
+        msa_init_upper  (\wd+1)
+        .endif
+        .endm
+
+        .macro  msa_init_all_upper
+        .set    push
+        .set    noat
+        not     $1, zero
+        msa_init_upper  0
+        .set    pop
+        .endm
+
 #endif /* _ASM_ASMMACRO_H */