From 74804fd3e3ef5c23e00f85eace48754c66ed18e5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Brucker Date: Tue, 14 May 2019 14:41:54 +0800 Subject: [PATCH] arm64: Clear OSDLR_EL1 on CPU boot mainline inclusion from mainline-5.1 commit 6fda41bf1261 category: bugfix bugzilla: 14500 CVE: NA ------------------------------------------------- Some firmwares may reboot CPUs with OS Double Lock set. Make sure that it is unlocked, in order to use debug exceptions. Cc: Signed-off-by: Jean-Philippe Brucker Signed-off-by: Will Deacon Signed-off-by: Hongbo Yao Reviewed-by: Xuefeng Wang Reviewed-by: Chen Zhou Signed-off-by: Yang Yingliang --- arch/arm64/kernel/debug-monitors.c | 1 + 1 file changed, 1 insertion(+) 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; -- GitLab