From b997e585bd4cbfc3ec6078e94813788e55e7cc22 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 26 Jun 2019 17:41:18 +0900 Subject: [PATCH] ODROID-C3/N2: arch/arm64: fix suspend/resume failure This patch is to fix the suspend/resume failure even after reverting the commit below: [235aeafb93e9] arm64: Save and restore OSDLR_EL1 across suspend/resume This change is discovered in the merging commit 'v4.9.174' and 'v4.9.180'. Change-Id: Iec21cd95661582117974e76fa5117b5f686cd2e2 Signed-off-by: Dongjin Kim --- arch/arm64/mm/proc.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 369ae7ab5d6d..bf0821b7b1ab 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -70,11 +70,14 @@ ENTRY(cpu_do_suspend) mrs x8, mdscr_el1 mrs x9, oslsr_el1 mrs x10, sctlr_el1 + mrs x11, tpidr_el1 + mrs x12, sp_el0 stp x2, x3, [x0] stp x4, xzr, [x0, #16] stp x5, x6, [x0, #32] stp x7, x8, [x0, #48] stp x9, x10, [x0, #64] + stp x11, x12, [x0, #80] ret ENDPROC(cpu_do_suspend)