Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c496f3c0 authored by Matt Redfearn's avatar Matt Redfearn Committed by James Hogan
Browse files

MIPS: Fix exception entry when CONFIG_EVA enabled



Commit 9fef6868 ("MIPS: Make SAVE_SOME more standard") made several
changes to the order in which registers are saved in the SAVE_SOME
macro, used by exception handlers to save the processor state. In
particular, it removed the
move   k1, sp
in the delay slot of the branch testing if the processor is already in
kernel mode. This is replaced later in the macro by a
move   k0, sp
When CONFIG_EVA is disabled, this instruction actually appears in the
delay slot of the branch. However, when CONFIG_EVA is enabled, instead
the RPS workaround of
MFC0	k0, CP0_ENTRYHI
appears in the delay slot. This results in k0 not containing the stack
pointer, but some unrelated value, which is then saved to the kernel
stack. On exit from the exception, this bogus value is restored to the
stack pointer, resulting in an OOPS.

Fix this by moving the save of SP in k0 explicitly in the delay slot of
the branch, outside of the CONFIG_EVA section, restoring the expected
instruction ordering when CONFIG_EVA is active.

Fixes: 9fef6868 ("MIPS: Make SAVE_SOME more standard")
Signed-off-by: default avatarMatt Redfearn <matt.redfearn@mips.com>
Reported-by: default avatarVladimir Kondratiev <vladimir.kondratiev@intel.com>
Reviewed-by: default avatarCorey Minyard <cminyard@mvista.com>
Reviewed-by: default avatarJames Hogan <jhogan@kernel.org>
Patchwork: https://patchwork.linux-mips.org/patch/17471/


Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent a1286968
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@
		sll	k0, 3		/* extract cu0 bit */
		.set	noreorder
		bltz	k0, 8f
		 move	k0, sp
		.if \docfi
		.cfi_register sp, k0
		.endif
#ifdef CONFIG_EVA
		/*
		 * Flush interAptiv's Return Prediction Stack (RPS) by writing
@@ -225,10 +229,6 @@
		MTC0	k0, CP0_ENTRYHI
#endif
		.set	reorder
		 move	k0, sp
		.if \docfi
		.cfi_register sp, k0
		.endif
		/* Called from user mode, new stack. */
		get_saved_sp docfi=\docfi tosp=1
8: