MIPS: dsp: Add assembler support for DSP ASEs.

Newer toolchains support the DSP and DSP Rev2 instructions. This patch
performs a check for that support and adds compiler and assembler
flags for only the files that need use those instructions.

Signed-off-by: Steven J. Hill <sjhill@mips.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4752/
Signed-off-by: John Crispin <blogic@openwrt.org>

1 files changed, 36 insertions, 17 deletions

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 3e36745670b2..578132219ff6 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1155,36 +1155,26 @@ do {									\
         : "=r" (__res));                                        \
         __res;})
 
+#ifdef HAVE_AS_DSP
 #define rddsp(mask)                                                     \
 ({                                                                      \
-        unsigned int __res;                                             \
+        unsigned int __dspctl;                                          \
                                                                         \
         __asm__ __volatile__(                                           \
-        "       .set    push                            \n"             \
-        "       .set    noat                            \n"             \
-        "       # rddsp $1, %x1                         \n"             \
-        "       .word   0x7c000cb8 | (%x1 << 16)        \n"             \
-        "       move    %0, $1                          \n"             \
-        "       .set    pop                             \n"             \
-        : "=r" (__res)                                                  \
+        "       rddsp   %0, %x1                                 \n"     \
+        : "=r" (__dspctl)                                               \
         : "i" (mask));                                                  \
-        __res;                                                          \
+        __dspctl;                                                       \
 })
 
 #define wrdsp(val, mask)                                                \
 do {                                                                    \
         __asm__ __volatile__(                                           \
-        "       .set    push                                    \n"     \
-        "       .set    noat                                    \n"     \
-        "       move    $1, %0                                  \n"     \
-        "       # wrdsp $1, %x1                                 \n"     \
-        "       .word   0x7c2004f8 | (%x1 << 11)                \n"     \
-        "       .set    pop                                     \n"     \
-        :                                                               \
+        "       wrdsp   %0, %x1                                 \n"     \
+        :                                                               \
         : "r" (val), "i" (mask));                                       \
 } while (0)
 
-#if 0   /* Need DSP ASE capable assembler ... */
 #define mflo0() ({ long mflo0; __asm__("mflo %0, $ac0" : "=r" (mflo0)); mflo0;})
 #define mflo1() ({ long mflo1; __asm__("mflo %0, $ac1" : "=r" (mflo1)); mflo1;})
 #define mflo2() ({ long mflo2; __asm__("mflo %0, $ac2" : "=r" (mflo2)); mflo2;})
@@ -1207,6 +1197,35 @@ do {									\
 
 #else
 
+#define rddsp(mask)                                                     \
+({                                                                      \
+        unsigned int __res;                                             \
+                                                                        \
+        __asm__ __volatile__(                                           \
+        "       .set    push                            \n"             \
+        "       .set    noat                            \n"             \
+        "       # rddsp $1, %x1                         \n"             \
+        "       .word   0x7c000cb8 | (%x1 << 16)        \n"             \
+        "       move    %0, $1                          \n"             \
+        "       .set    pop                             \n"             \
+        : "=r" (__res)                                                  \
+        : "i" (mask));                                                  \
+        __res;                                                          \
+})
+
+#define wrdsp(val, mask)                                                \
+do {                                                                    \
+        __asm__ __volatile__(                                           \
+        "       .set    push                                    \n"     \
+        "       .set    noat                                    \n"     \
+        "       move    $1, %0                                  \n"     \
+        "       # wrdsp $1, %x1                                 \n"     \
+        "       .word   0x7c2004f8 | (%x1 << 11)                \n"     \
+        "       .set    pop                                     \n"     \
+        :                                                               \
+        : "r" (val), "i" (mask));                                       \
+} while (0)
+
 #define mfhi0()                                                         \
 ({                                                                      \
         unsigned long __treg;                                           \