 6ebbf2ce43
			
		
	
	
	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>
		
	
			
		
			
				
	
	
		
			94 lines
		
	
	
	
		
			1.6 KiB
			
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
	
		
			1.6 KiB
			
		
	
	
	
		
			ArmAsm
		
	
	
	
	
	
| /*
 | |
|  *  linux/arch/arm/lib/io-writesb.S
 | |
|  *
 | |
|  *  Copyright (C) 1995-2000 Russell King
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  */
 | |
| #include <linux/linkage.h>
 | |
| #include <asm/assembler.h>
 | |
| 
 | |
| 		.macro	outword, rd
 | |
| #ifndef __ARMEB__
 | |
| 		strb	\rd, [r0]
 | |
| 		mov	\rd, \rd, lsr #8
 | |
| 		strb	\rd, [r0]
 | |
| 		mov	\rd, \rd, lsr #8
 | |
| 		strb	\rd, [r0]
 | |
| 		mov	\rd, \rd, lsr #8
 | |
| 		strb	\rd, [r0]
 | |
| #else
 | |
| 		mov	lr, \rd, lsr #24
 | |
| 		strb	lr, [r0]
 | |
| 		mov	lr, \rd, lsr #16
 | |
| 		strb	lr, [r0]
 | |
| 		mov	lr, \rd, lsr #8
 | |
| 		strb	lr, [r0]
 | |
| 		strb	\rd, [r0]
 | |
| #endif
 | |
| 		.endm
 | |
| 
 | |
| .Loutsb_align:	rsb	ip, ip, #4
 | |
| 		cmp	ip, r2
 | |
| 		movgt	ip, r2
 | |
| 		cmp	ip, #2
 | |
| 		ldrb	r3, [r1], #1
 | |
| 		strb	r3, [r0]
 | |
| 		ldrgeb	r3, [r1], #1
 | |
| 		strgeb	r3, [r0]
 | |
| 		ldrgtb	r3, [r1], #1
 | |
| 		strgtb	r3, [r0]
 | |
| 		subs	r2, r2, ip
 | |
| 		bne	.Loutsb_aligned
 | |
| 
 | |
| ENTRY(__raw_writesb)
 | |
| 		teq	r2, #0		@ do we have to check for the zero len?
 | |
| 		reteq	lr
 | |
| 		ands	ip, r1, #3
 | |
| 		bne	.Loutsb_align
 | |
| 
 | |
| .Loutsb_aligned:
 | |
| 		stmfd	sp!, {r4, r5, lr}
 | |
| 
 | |
| 		subs	r2, r2, #16
 | |
| 		bmi	.Loutsb_no_16
 | |
| 
 | |
| .Loutsb_16_lp:	ldmia	r1!, {r3, r4, r5, ip}
 | |
| 		outword	r3
 | |
| 		outword	r4
 | |
| 		outword	r5
 | |
| 		outword	ip
 | |
| 		subs	r2, r2, #16
 | |
| 		bpl	.Loutsb_16_lp
 | |
| 
 | |
| 		tst	r2, #15
 | |
| 		ldmeqfd	sp!, {r4, r5, pc}
 | |
| 
 | |
| .Loutsb_no_16:	tst	r2, #8
 | |
| 		beq	.Loutsb_no_8
 | |
| 
 | |
| 		ldmia	r1!, {r3, r4}
 | |
| 		outword	r3
 | |
| 		outword	r4
 | |
| 
 | |
| .Loutsb_no_8:	tst	r2, #4
 | |
| 		beq	.Loutsb_no_4
 | |
| 
 | |
| 		ldr	r3, [r1], #4
 | |
| 		outword	r3
 | |
| 
 | |
| .Loutsb_no_4:	ands	r2, r2, #3
 | |
| 		ldmeqfd	sp!, {r4, r5, pc}
 | |
| 
 | |
| 		cmp	r2, #2
 | |
| 		ldrb	r3, [r1], #1
 | |
| 		strb	r3, [r0]
 | |
| 		ldrgeb	r3, [r1], #1
 | |
| 		strgeb	r3, [r0]
 | |
| 		ldrgtb	r3, [r1]
 | |
| 		strgtb	r3, [r0]
 | |
| 
 | |
| 		ldmfd	sp!, {r4, r5, pc}
 | |
| ENDPROC(__raw_writesb)
 |