From: Anson Huang <b20788@freescale.com>
Date: Tue, 13 Dec 2011 08:43:37 +0000 (+0800)
Subject: ENGR00170150 [MX6]Fix suspend/resume fail of debug kernel
X-Git-Tag: v3.0.35-fsl~1771
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc1b2b6eabb8a70627f425841842d93447f19ec7;p=karo-tx-linux.git

ENGR00170150 [MX6]Fix suspend/resume fail of debug kernel

Need to push and pop all registers, otherwise, some registers
will be modified in the function call, add protection to avoid
this scenario.

Signed-off-by: Anson Huang <b20788@freescale.com>
---

diff --git a/arch/arm/mach-mx6/mx6q_suspend.S b/arch/arm/mach-mx6/mx6q_suspend.S
index b1700433d1b4..bbda5aa36768 100644
--- a/arch/arm/mach-mx6/mx6q_suspend.S
+++ b/arch/arm/mach-mx6/mx6q_suspend.S
@@ -559,8 +559,11 @@ use_ttbr0:
 	bx	r1
 mmu_on_label:
 	mov 	r8, lr
+	push	{r0}
+
 	/* Set up the per-CPU stacks */
 	bl	cpu_init
+	pop	{r0}
 
 #ifdef CONFIG_CACHE_L2X0
 	ldr r2, =L2_BASE_ADDR