MIPS: Fix unaligned PC interpretation in `compute_return_epc'
authorMaciej W. Rozycki <macro@imgtec.com>
Thu, 15 Jun 2017 23:07:34 +0000 (00:07 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 12 Oct 2017 14:27:57 +0000 (15:27 +0100)
commit9840bcc871b6dd1c86eedc3a9ad876c8e8a00f2c
tree7c3862ef7c697adf454cb7fa33882a18d360a9bf
parent3897c8807f6992c91cc714ab692d9bbf4a14b272
MIPS: Fix unaligned PC interpretation in `compute_return_epc'

commit 11a3799dbeb620bf0400b1fda5cc2c6bea55f20a upstream.

Fix a regression introduced with commit fb6883e5809c ("MIPS: microMIPS:
Support handling of delay slots.") and defer to `__compute_return_epc'
if the ISA bit is set in EPC with non-MIPS16, non-microMIPS hardware,
which will then arrange for a SIGBUS due to an unaligned instruction
reference.  Returning EPC here is never correct as the API defines this
function's result to be either a negative error code on failure or one
of 0 and BRANCH_LIKELY_TAKEN on success.

Fixes: fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.")
Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16395/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/mips/include/asm/branch.h