MIPS: Introduce _EXT assembler macro

This patch adds a simple macro to wrap the ext instruction which was
introduced with MIPSR2, and fall back to a shift & and pair for
pre-MIPSR2 CPUs. This will be used in a subsequent patch.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6358/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 3220c93ea981da828e94820bb6ec7c9a570db70f..ef066b17a650f6c5ed68f3c324f637e0f01dba28 100644 (file)
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -169,6 +169,17 @@
        fpu_restore_16even \thread \tmp
        .endm
 
+#ifdef CONFIG_CPU_MIPSR2
+       .macro  _EXT    rd, rs, p, s
+       ext     \rd, \rs, \p, \s
+       .endm
+#else /* !CONFIG_CPU_MIPSR2 */
+       .macro  _EXT    rd, rs, p, s
+       srl     \rd, \rs, \p
+       andi    \rd, \rd, (1 << \s) - 1
+       .endm
+#endif /* !CONFIG_CPU_MIPSR2 */
+
 /*
  * Temporary until all gas have MT ASE support
  */