[3.16.y-ckt stable] Patch "ARM: 8284/1: sa1100: clear RCSR_SMR on resume" has been added to staging queue
luis.henriques at canonical.com
Mon Mar 2 13:35:04 UTC 2015
This is a note to let you know that I have just added a patch titled
ARM: 8284/1: sa1100: clear RCSR_SMR on resume
to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
which can be found at:
This patch is scheduled to be released in version 3.16.7-ckt8.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.16.y-ckt tree, see
>From f38e1da055d7046cdf716799de431ba0f27315db Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date: Thu, 15 Jan 2015 03:06:22 +0100
Subject: ARM: 8284/1: sa1100: clear RCSR_SMR on resume
commit e461894dc2ce7778ccde1c3483c9b15a85a7fc5f upstream.
StrongARM core uses RCSR SMR bit to tell to bootloader that it was reset
by entering the sleep mode. After we have resumed, there is little point
in having that bit enabled. Moreover, if this bit is set before reboot,
the bootloader can become confused. Thus clear the SMR bit on resume
just before clearing the scratchpad (resume address) register.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
arch/arm/mach-sa1100/pm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 6645d1e31f14..34853d5dfda2 100644
@@ -81,6 +81,7 @@ static int sa11x0_pm_enter(suspend_state_t state)
* Ensure not to come back here if it wasn't intended
+ RCSR = RCSR_SMR;
PSPR = 0;
More information about the kernel-team