Commit 631afc65 authored Mar 27, 2015 by Paul Burton Committed by Ralf Baechle Mar 27, 2015

MIPS: Push .set mips64r* into the functions needing it



The {save,restore}_fp_context{,32} functions require that the assembler
allows the use of sdc instructions on any FP register, and this is
acomplished by setting the arch to mips64r2 or mips64r6
(using MIPS_ISA_ARCH_LEVEL_RAW).

However this has the effect of enabling the assembler to use mips64
instructions in the expansion of pseudo-instructions. This was done in
the (now-reverted) commit eec43a22 "MIPS: Save/restore MSA context
around signals" which led to my mistakenly believing that there was an
assembler bug, when in reality the assembler was just emitting mips64
instructions. Avoid the issue for future commits which will add code to
r4k_fpu.S by pushing the .set MIPS_ISA_ARCH_LEVEL_RAW directives into
the functions that require it, and remove the spurious assertion
declaring the assembler bug.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
[james.hogan@imgtec.com: Rebase on v4.0-rc1 and reword commit message to
 reflect use of MIPS_ISA_ARCH_LEVEL_RAW]
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9612/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent acaf6a97

arch/mips/include/asm/asmmacro.h

+4 −8

Original line number	Diff line number	Diff line
		@@ -326,8 +326,7 @@
		SET_HARDFLOAT
		.insn
		.word COPY_UW_MSA_INSN \| (\n << 16) \| (\ws << 11)
		/* move triggers an assembler bug... */
		or \rd, $1, zero
		move \rd, $1
		.set pop
		.endm

		@@ -337,8 +336,7 @@
		SET_HARDFLOAT
		.insn
		.word COPY_UD_MSA_INSN \| (\n << 16) \| (\ws << 11)
		/* move triggers an assembler bug... */
		or \rd, $1, zero
		move \rd, $1
		.set pop
		.endm

		@@ -346,8 +344,7 @@
		.set push
		.set noat
		SET_HARDFLOAT
		/* move triggers an assembler bug... */
		or $1, \rs, zero
		move $1, \rs
		.word INSERT_W_MSA_INSN \| (\n << 16) \| (\wd << 6)
		.set pop
		.endm
		@@ -356,8 +353,7 @@
		.set push
		.set noat
		SET_HARDFLOAT
		/* move triggers an assembler bug... */
		or $1, \rs, zero
		move $1, \rs
		.word INSERT_D_MSA_INSN \| (\n << 16) \| (\wd << 6)
		.set pop
		.endm

arch/mips/kernel/r4k_fpu.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		.endm

		.set noreorder
		.set MIPS_ISA_ARCH_LEVEL_RAW

		LEAF(_save_fp_context)
		.set push
		@@ -103,6 +102,7 @@ LEAF(_save_fp_context)
		/* Save 32-bit process floating point context */
		LEAF(_save_fp_context32)
		.set push
		.set MIPS_ISA_ARCH_LEVEL_RAW
		SET_HARDFLOAT
		cfc1 t1, fcr31