Skip to content

Commit

Permalink
MIPS: CPS: drop .set mips64r2 directives
Browse files Browse the repository at this point in the history
Commit 977e043 ("MIPS: kernel: cps-vec: Replace mips32r2 ISA level
with mips64r2") leads to .set mips64r2 directives being present in 32
bit (ie. CONFIG_32BIT=y) kernels. This is incorrect & leads to MIPS64
instructions being emitted by the assembler when expanding
pseudo-instructions. For example the "move" instruction can legitimately
be expanded to a "daddu". This causes problems when the kernel is run on
a MIPS32 CPU, as CONFIG_32BIT kernels of course often are...

Fix this by dropping the .set <ISA> directives entirely now that Kconfig
should be ensuring that kernels including this code are built with a
suitable -march= compiler flag.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: <stable@vger.kernel.org> # 3.16+
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10869/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Paul Burton authored and Ralf Baechle committed Dec 22, 2015
1 parent d6a428f commit f3575e2
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/mips/kernel/cps-vec.S
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ LEAF(mips_cps_core_init)
has_mt t0, 3f

.set push
.set mips64r2
.set mt

/* Only allow 1 TC per VPE to execute... */
Expand Down Expand Up @@ -376,7 +375,6 @@ LEAF(mips_cps_boot_vpes)
nop

.set push
.set mips64r2
.set mt

1: /* Enter VPE configuration state */
Expand Down

0 comments on commit f3575e2

Please sign in to comment.