diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-08-19 18:15:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-24 12:48:11 +0100 |
| commit | 622b0c1f679dc6e1b9ac2006a7c542f9a51b963e (patch) | |
| tree | 82e8c752acaf86c39689f748121075e32bd00408 /arch/mips | |
| parent | e941976a28821e9c471a011eba2a958e1369c275 (diff) | |
| download | linux-stable-622b0c1f679dc6e1b9ac2006a7c542f9a51b963e.tar.gz linux-stable-622b0c1f679dc6e1b9ac2006a7c542f9a51b963e.tar.bz2 linux-stable-622b0c1f679dc6e1b9ac2006a7c542f9a51b963e.zip | |
MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS
[ Upstream commit 1eefcbc89cf3a8e252e5aeb25825594699b47360 ]
When the kernel is built for microMIPS, branches targets need to be
known to be microMIPS code in order to result in bit 0 of the PC being
set. The branch target in the BUILD_ROLLBACK_PROLOGUE macro was simply
the end of the macro, which may be pointing at padding rather than at
code. This results in recent enough GNU linkers complaining like so:
mips-img-linux-gnu-ld: arch/mips/built-in.o: .text+0x3e3c: Unsupported branch between ISA modes.
mips-img-linux-gnu-ld: final link failed: Bad value
Makefile:936: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1
Fix this by changing the branch target to be the start of the
appropriate handler, skipping over any padding.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14019/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/genex.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 7ffd158de76e..1b837d6f73de 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -142,9 +142,8 @@ LEAF(__r4k_wait) PTR_LA k1, __r4k_wait ori k0, 0x1f /* 32 byte rollback region */ xori k0, 0x1f - bne k0, k1, 9f + bne k0, k1, \handler MTC0 k0, CP0_EPC -9: .set pop .endm |