]> git.karo-electronics.de Git - karo-tx-linux.git/commit
MIPS: Fix protected_cache(e)_op() for microMIPS
authorPaul Burton <paul.burton@imgtec.com>
Mon, 6 Feb 2017 19:03:15 +0000 (11:03 -0800)
committerJames Hogan <james.hogan@imgtec.com>
Mon, 13 Feb 2017 18:57:33 +0000 (18:57 +0000)
commitf229454d34e000e714280e767811304e29d96bea
tree4ab87a724fecfc6e202e7f0ef083851ed6ceaa7c
parentf700a420088624671ed955bf818c17012bb57bca
MIPS: Fix protected_cache(e)_op() for microMIPS

When building for microMIPS we need to ensure that the assembler always
knows that there is code at the target of a branch or jump. Commit
7170bdc77755 ("MIPS: Add return errors to protected cache ops")
introduced a fixup path to protected_cache(e)_op() which does not meet
this requirement. The fixup path jumps to the "2" label but the .section
pseudo-op immediately following it causes the label to be marked as
data. Linking then fails with:

  mips-img-linux-gnu-ld: arch/mips/mm/c-r4k.o: .fixup+0x0: Unsupported
  jump between ISA modes; consider recompiling with interlinking
  enabled.

Fix this by declaring that "2" labels code using the .insn directive.

Fixes: 7170bdc77755 ("MIPS: Add return errors to protected cache ops")
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/15274/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
arch/mips/include/asm/r4kcache.h