Commit d3f8b797 authored by Paul Burton's avatar Paul Burton Committed by Kamal Mostafa

MIPS: CPS: drop .set mips64r2 directives

commit f3575e23 upstream.

Commit 977e043d ("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: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10869/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 40850a73
...@@ -229,7 +229,6 @@ LEAF(mips_cps_core_init) ...@@ -229,7 +229,6 @@ LEAF(mips_cps_core_init)
has_mt t0, 3f has_mt t0, 3f
.set push .set push
.set mips64r2
.set mt .set mt
/* Only allow 1 TC per VPE to execute... */ /* Only allow 1 TC per VPE to execute... */
...@@ -348,7 +347,6 @@ LEAF(mips_cps_boot_vpes) ...@@ -348,7 +347,6 @@ LEAF(mips_cps_boot_vpes)
nop nop
.set push .set push
.set mips64r2
.set mt .set mt
1: /* Enter VPE configuration state */ 1: /* Enter VPE configuration state */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment