summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorJean-Philippe Brucker <jean-philippe.brucker@arm.com>2019-04-08 18:17:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-22 07:37:36 +0200
commitf273cd16554a92ea746cf117a126ff5be8c54794 (patch)
treedaeab5ecceb4028968f130cb0d1074a2c2b13ed1 /arch/arm64
parent26e7d2ad97b9dcc1a4618d0803847a31fc013e86 (diff)
downloadlinux-stable-f273cd16554a92ea746cf117a126ff5be8c54794.tar.gz
linux-stable-f273cd16554a92ea746cf117a126ff5be8c54794.tar.bz2
linux-stable-f273cd16554a92ea746cf117a126ff5be8c54794.zip
arm64: Clear OSDLR_EL1 on CPU boot
commit 6fda41bf12615ee7c3ddac88155099b1a8cf8d00 upstream. Some firmwares may reboot CPUs with OS Double Lock set. Make sure that it is unlocked, in order to use debug exceptions. Cc: <stable@vger.kernel.org> Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/kernel/debug-monitors.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 06ca574495af..262925b98f42 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -135,6 +135,7 @@ NOKPROBE_SYMBOL(disable_debug_monitors);
*/
static int clear_os_lock(unsigned int cpu)
{
+ write_sysreg(0, osdlr_el1);
write_sysreg(0, oslar_el1);
isb();
return 0;