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

Commit 2c3a0540 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 2943/1: Clear the exclusive monitor in v6_early_abort



Patch from Catalin Marinas

Data abort caused by ldrex/strex can leave the exclusive monitor in an
unpredictable state. It is recommended that a clrex/strex is performed to
clear this state.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 487fd4eb
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,11 @@
 */
 */
	.align	5
	.align	5
ENTRY(v6_early_abort)
ENTRY(v6_early_abort)
#ifdef CONFIG_CPU_MPCORE
	clrex
#else
	strex	r0, r1, [sp]			@ Clear the exclusive monitor
#endif
	mrc	p15, 0, r1, c5, c0, 0		@ get FSR
	mrc	p15, 0, r1, c5, c0, 0		@ get FSR
	mrc	p15, 0, r0, c6, c0, 0		@ get FAR
	mrc	p15, 0, r0, c6, c0, 0		@ get FAR
/*
/*