diff mbox

[U-Boot] BUGFIX: arm: armv7: data abort in get_bad_stack_swi

Message ID 1365051167-24742-1-git-send-email-koba@kmckk.co.jp
State Changes Requested
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Tetsuyuki Kobayashi April 4, 2013, 4:52 a.m. UTC
When swi instruction is executed, it is expected to get message
"software interrupt" in console and dump registers and reboot, as
do_software_interrupt() in arch/arm/lib/interrupts.c.
Actually it causes data abort in get_bad_stack_swi macro in
arch/arm/cpu/v7/start.S.
This patch fixes this problem.

Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
---
Hello, I found this bug on KZM-A9-GT board (aka. kzm9g) on
v2013.04-rc2. And tested this patch on the board.
I found the same typo in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.

 arch/arm/cpu/armv7/start.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Albert ARIBAUD April 4, 2013, 6:21 a.m. UTC | #1
Hi Tetsuyuki,

On Thu,  4 Apr 2013 13:52:47 +0900, Tetsuyuki Kobayashi
<koba@kmckk.co.jp> wrote:

> When swi instruction is executed, it is expected to get message
> "software interrupt" in console and dump registers and reboot, as
> do_software_interrupt() in arch/arm/lib/interrupts.c.
> Actually it causes data abort in get_bad_stack_swi macro in
> arch/arm/cpu/v7/start.S.
> This patch fixes this problem.
> 
> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
> ---
> Hello, I found this bug on KZM-A9-GT board (aka. kzm9g) on
> v2013.04-rc2. And tested this patch on the board.
> I found the same typo in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.

The can you please submit a V2 patch fixing all four of them?

Amicalement,
Albert ARIBAUD April 4, 2013, 6:24 a.m. UTC | #2
> The can you please submit a V2 patch fixing all four of them?

s/The/Then/ (and s//coffee, too)

Amicalement,
Tetsuyuki Kobayashi April 4, 2013, 10:29 a.m. UTC | #3
(04/04/2013 03:24 PM), Albert ARIBAUD wrote:
>> The can you please submit a V2 patch fixing all four of them?
> 
> s/The/Then/ (and s//coffee, too)
> 
> Amicalement,
> 
OK. I will do it tomorrow.
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 36a4c3c..9bf950b 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -465,7 +465,7 @@  ENDPROC(cpu_init_crit)
 						@ spots for abort stack
 	str	lr, [r0]			@ save caller lr in position 0
 						@ of saved stack
-	mrs	r0, spsr			@ get the spsr
+	mrs	lr, spsr			@ get the spsr
 	str	lr, [r0, #4]			@ save spsr in position 1 of
 						@ saved stack
 	ldr	r0, [r13]			@ restore r0