mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
6ebbf2ce43
ARMv6 and greater introduced a new instruction ("bx") which can be used
to return from function calls. Recent CPUs perform better when the
"bx lr" instruction is used rather than the "mov pc, lr" instruction,
and this sequence is strongly recommended to be used by the ARM
architecture manual (section A.4.1.1).
We provide a new macro "ret" with all its variants for the condition
code which will resolve to the appropriate instruction.
Rather than doing this piecemeal, and miss some instances, change all
the "mov pc" instances to use the new macro, with the exception of
the "movs" instruction and the kprobes code. This allows us to detect
the "mov pc, lr" case and fix it up - and also gives us the possibility
of deploying this for other registers depending on the CPU selection.
Reported-by: Will Deacon <will.deacon@arm.com>
Tested-by: Stephen Warren <swarren@nvidia.com> # Tegra Jetson TK1
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> # mioa701_bootresume.S
Tested-by: Andrew Lunn <andrew@lunn.ch> # Kirkwood
Tested-by: Shawn Guo <shawn.guo@freescale.com>
Tested-by: Tony Lindgren <tony@atomide.com> # OMAPs
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> # Armada XP, 375, 385
Acked-by: Sekhar Nori <nsekhar@ti.com> # DaVinci
Acked-by: Christoffer Dall <christoffer.dall@linaro.org> # kvm/hyp
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> # PXA3xx
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> # Xen
Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> # ARMv7M
Tested-by: Simon Horman <horms+renesas@verge.net.au> # Shmobile
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
69 lines
1.8 KiB
ArmAsm
69 lines
1.8 KiB
ArmAsm
/* linux/arch/arm/mach-s3c2412/sleep.S
|
|
*
|
|
* Copyright (c) 2007 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* S3C2412 Power Manager low-level sleep support
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/linkage.h>
|
|
#include <asm/assembler.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/map.h>
|
|
|
|
#include <mach/regs-irq.h>
|
|
|
|
.text
|
|
|
|
.global s3c2412_sleep_enter
|
|
|
|
s3c2412_sleep_enter:
|
|
mov r0, #0 /* argument for coprocessors */
|
|
ldr r1, =S3C2410_INTPND
|
|
ldr r2, =S3C2410_SRCPND
|
|
ldr r3, =S3C2410_EINTPEND
|
|
|
|
teq r0, r0
|
|
bl s3c2412_sleep_enter1
|
|
teq pc, r0
|
|
bl s3c2412_sleep_enter1
|
|
|
|
.align 5
|
|
|
|
/* this is called twice, first with the Z flag to ensure that the
|
|
* instructions have been loaded into the cache, and the second
|
|
* time to try and suspend the system.
|
|
*/
|
|
s3c2412_sleep_enter1:
|
|
mcr p15, 0, r0, c7, c10, 4
|
|
mcrne p15, 0, r0, c7, c0, 4
|
|
|
|
/* if we return from here, it is because an interrupt was
|
|
* active when we tried to shutdown. Try and ack the IRQ and
|
|
* retry, as simply returning causes the system to lock.
|
|
*/
|
|
|
|
ldrne r9, [r1]
|
|
strne r9, [r1]
|
|
ldrne r9, [r2]
|
|
strne r9, [r2]
|
|
ldrne r9, [r3]
|
|
strne r9, [r3]
|
|
bne s3c2412_sleep_enter1
|
|
|
|
ret lr
|