1 files changed, 11 insertions, 0 deletions

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 6156ac8c4cfb..76317a70200d 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -211,9 +211,13 @@
         .endm
 
 #ifdef TOOLCHAIN_SUPPORTS_MSA
+/* preprocessor replaces the fp in ".set fp=64" with $30 otherwise */
+#undef fp
+
         .macro  _cfcmsa rd, cs
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         cfcmsa  \rd, $\cs
         .set    pop
@@ -222,6 +226,7 @@
         .macro  _ctcmsa cd, rs
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         ctcmsa  $\cd, \rs
         .set    pop
@@ -230,6 +235,7 @@
         .macro  ld_d    wd, off, base
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         ld.d    $w\wd, \off(\base)
         .set    pop
@@ -238,6 +244,7 @@
         .macro  st_d    wd, off, base
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         st.d    $w\wd, \off(\base)
         .set    pop
@@ -246,6 +253,7 @@
         .macro  copy_u_w        ws, n
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         copy_u.w $1, $w\ws[\n]
         .set    pop
@@ -254,6 +262,7 @@
         .macro  copy_u_d        ws, n
         .set    push
         .set    mips64r2
+        .set    fp=64
         .set    msa
         copy_u.d $1, $w\ws[\n]
         .set    pop
@@ -262,6 +271,7 @@
         .macro  insert_w        wd, n
         .set    push
         .set    mips32r2
+        .set    fp=64
         .set    msa
         insert.w $w\wd[\n], $1
         .set    pop
@@ -270,6 +280,7 @@
         .macro  insert_d        wd, n
         .set    push
         .set    mips64r2
+        .set    fp=64
         .set    msa
         insert.d $w\wd[\n], $1
         .set    pop