* [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi
@ 2013-04-04 4:52 Tetsuyuki Kobayashi
2013-04-04 6:21 ` Albert ARIBAUD
2013-04-05 1:45 ` [U-Boot] [PATCH v2] BUGFIX: arm: " Tetsuyuki Kobayashi
0 siblings, 2 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-04 4:52 UTC (permalink / raw)
To: u-boot
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(-)
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi
2013-04-04 4:52 [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi Tetsuyuki Kobayashi
@ 2013-04-04 6:21 ` Albert ARIBAUD
2013-04-04 6:24 ` Albert ARIBAUD
2013-04-05 1:45 ` [U-Boot] [PATCH v2] BUGFIX: arm: " Tetsuyuki Kobayashi
1 sibling, 1 reply; 10+ messages in thread
From: Albert ARIBAUD @ 2013-04-04 6:21 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi
2013-04-04 6:21 ` Albert ARIBAUD
@ 2013-04-04 6:24 ` Albert ARIBAUD
2013-04-04 10:29 ` Tetsuyuki Kobayashi
0 siblings, 1 reply; 10+ messages in thread
From: Albert ARIBAUD @ 2013-04-04 6:24 UTC (permalink / raw)
To: u-boot
> The can you please submit a V2 patch fixing all four of them?
s/The/Then/ (and s//coffee, too)
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi
2013-04-04 6:24 ` Albert ARIBAUD
@ 2013-04-04 10:29 ` Tetsuyuki Kobayashi
0 siblings, 0 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-04 10:29 UTC (permalink / raw)
To: u-boot
(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.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-04 4:52 [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi Tetsuyuki Kobayashi
2013-04-04 6:21 ` Albert ARIBAUD
@ 2013-04-05 1:45 ` Tetsuyuki Kobayashi
2013-04-05 7:04 ` Albert ARIBAUD
2013-04-05 10:12 ` [U-Boot] [PATCH v3] " Tetsuyuki Kobayashi
1 sibling, 2 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-05 1:45 UTC (permalink / raw)
To: u-boot
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.
But, actually it causes data abort accessing wrong address in get_bad_stack_swi
macro in arch/arm/cpu/v7/start.S.
This patch fixes this problem.
The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
---
Changes for v2:
- added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
(But not tested, because I don't have test boards of them)
arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
arch/arm/cpu/arm1136/start.S | 2 +-
arch/arm/cpu/arm1176/start.S | 2 +-
arch/arm/cpu/armv7/start.S | 2 +-
arch/arm/cpu/pxa/start.S | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index eba2324..7b9db2b 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -392,7 +392,7 @@ cpu_init_crit:
str r0, [r13] @ save R0's value.
ldr r0, IRQ_STACK_START_IN @ get data regions start
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
add r13, r13, #4 @ pop stack entry
diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 3c291fb..8534fb8 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -480,7 +480,7 @@ phy_last_jump:
/* save caller lr in position 0 of saved stack */
str lr, [r0]
/* get the spsr */
- mrs r0, spsr
+ mrs lr, spsr
/* save spsr in position 1 of saved stack */
str lr, [r0, #4]
/* restore r0 */
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
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 456a783..18131bb 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -387,7 +387,7 @@ cpu_init_crit:
str r0, [r13] @ save R0's value.
ldr r0, IRQ_STACK_START_IN @ get data regions start
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
add r13, r13, #4 @ pop stack entry
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-05 1:45 ` [U-Boot] [PATCH v2] BUGFIX: arm: " Tetsuyuki Kobayashi
@ 2013-04-05 7:04 ` Albert ARIBAUD
2013-04-05 10:04 ` Tetsuyuki Kobayashi
2013-04-05 10:12 ` [U-Boot] [PATCH v3] " Tetsuyuki Kobayashi
1 sibling, 1 reply; 10+ messages in thread
From: Albert ARIBAUD @ 2013-04-05 7:04 UTC (permalink / raw)
To: u-boot
Hi Tetsuyuki,
On Fri, 5 Apr 2013 10:45:14 +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.
> But, actually it causes data abort accessing wrong address in get_bad_stack_swi
> macro in arch/arm/cpu/v7/start.S.
> This patch fixes this problem.
>
> The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
>
> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
> ---
> Changes for v2:
> - added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
> (But not tested, because I don't have test boards of them)
> arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
>
> arch/arm/cpu/arm1136/start.S | 2 +-
> arch/arm/cpu/arm1176/start.S | 2 +-
> arch/arm/cpu/armv7/start.S | 2 +-
> arch/arm/cpu/pxa/start.S | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
> index eba2324..7b9db2b 100644
> --- a/arch/arm/cpu/arm1136/start.S
> +++ b/arch/arm/cpu/arm1136/start.S
> @@ -392,7 +392,7 @@ cpu_init_crit:
> str r0, [r13] @ save R0's value.
> ldr r0, IRQ_STACK_START_IN @ get data regions start
> 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
> add r13, r13, #4 @ pop stack entry
Sorry for not checking this in V1, but I see that get_bad_stack_swi does
not preserve lr, so when bad_save_user_regs is expanded, it will save
the wrong value for lr. You need to restore lr from [r0] before you
restore r0 from [r13].
> diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
Ditto for all four files, of course.
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-05 7:04 ` Albert ARIBAUD
@ 2013-04-05 10:04 ` Tetsuyuki Kobayashi
0 siblings, 0 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-05 10:04 UTC (permalink / raw)
To: u-boot
Hi Albert
(04/05/2013 04:04 PM), Albert ARIBAUD wrote:
> Hi Tetsuyuki,
>
> On Fri, 5 Apr 2013 10:45:14 +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.
>> But, actually it causes data abort accessing wrong address in get_bad_stack_swi
>> macro in arch/arm/cpu/v7/start.S.
>> This patch fixes this problem.
>>
>> The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
>>
>> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
>> ---
>> Changes for v2:
>> - added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
>> (But not tested, because I don't have test boards of them)
>> arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
>>
>> arch/arm/cpu/arm1136/start.S | 2 +-
>> arch/arm/cpu/arm1176/start.S | 2 +-
>> arch/arm/cpu/armv7/start.S | 2 +-
>> arch/arm/cpu/pxa/start.S | 2 +-
>> 4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
>> index eba2324..7b9db2b 100644
>> --- a/arch/arm/cpu/arm1136/start.S
>> +++ b/arch/arm/cpu/arm1136/start.S
>> @@ -392,7 +392,7 @@ cpu_init_crit:
>> str r0, [r13] @ save R0's value.
>> ldr r0, IRQ_STACK_START_IN @ get data regions start
>> 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
>> add r13, r13, #4 @ pop stack entry
>
> Sorry for not checking this in V1, but I see that get_bad_stack_swi does
> not preserve lr, so when bad_save_user_regs is expanded, it will save
> the wrong value for lr. You need to restore lr from [r0] before you
> restore r0 from [r13].
Thank you, I was not aware that.
The dumped lr value was wrong.
I am going to post V3 patch for all 4 files.
>
>> diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
>
>> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
>
>> diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
>
> Ditto for all four files, of course.
>
> Amicalement,
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v3] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-05 1:45 ` [U-Boot] [PATCH v2] BUGFIX: arm: " Tetsuyuki Kobayashi
2013-04-05 7:04 ` Albert ARIBAUD
@ 2013-04-05 10:12 ` Tetsuyuki Kobayashi
2013-04-11 9:47 ` Tetsuyuki Kobayashi
2013-04-13 11:37 ` Albert ARIBAUD
1 sibling, 2 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-05 10:12 UTC (permalink / raw)
To: u-boot
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.
But, actually it causes data abort accessing wrong address in get_bad_stack_swi
macro in arch/arm/cpu/v7/start.S.
This patch fixes this problem.
The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
---
Changes for v2:
- added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
Changes for v3:
- restore lr register in all 4 files.
Only arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
arch/arm/cpu/arm1136/start.S | 3 ++-
arch/arm/cpu/arm1176/start.S | 4 +++-
arch/arm/cpu/armv7/start.S | 3 ++-
arch/arm/cpu/pxa/start.S | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index eba2324..bccfdbf 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -392,8 +392,9 @@ cpu_init_crit:
str r0, [r13] @ save R0's value.
ldr r0, IRQ_STACK_START_IN @ get data regions start
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 lr, [r0] @ restore lr
ldr r0, [r13] @ restore r0
add r13, r13, #4 @ pop stack entry
.endm
diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 3c291fb..694f79d 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -480,9 +480,11 @@ phy_last_jump:
/* save caller lr in position 0 of saved stack */
str lr, [r0]
/* get the spsr */
- mrs r0, spsr
+ mrs lr, spsr
/* save spsr in position 1 of saved stack */
str lr, [r0, #4]
+ /* restore lr */
+ ldr lr, [r0]
/* restore r0 */
ldr r0, [r13]
/* pop stack entry */
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 36a4c3c..e5e157b 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -465,9 +465,10 @@ 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 lr, [r0] @ restore lr
ldr r0, [r13] @ restore r0
add r13, r13, #4 @ pop stack entry
.endm
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 456a783..9c525e8 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -387,8 +387,9 @@ cpu_init_crit:
str r0, [r13] @ save R0's value.
ldr r0, IRQ_STACK_START_IN @ get data regions start
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 lr, [r0] @ restore lr
ldr r0, [r13] @ restore r0
add r13, r13, #4 @ pop stack entry
.endm
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v3] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-05 10:12 ` [U-Boot] [PATCH v3] " Tetsuyuki Kobayashi
@ 2013-04-11 9:47 ` Tetsuyuki Kobayashi
2013-04-13 11:37 ` Albert ARIBAUD
1 sibling, 0 replies; 10+ messages in thread
From: Tetsuyuki Kobayashi @ 2013-04-11 9:47 UTC (permalink / raw)
To: u-boot
Hello Albert
How about this patch?
(04/05/2013 07:12 PM), Tetsuyuki Kobayashi 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.
> But, actually it causes data abort accessing wrong address in get_bad_stack_swi
> macro in arch/arm/cpu/v7/start.S.
> This patch fixes this problem.
>
> The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
>
> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
> ---
> Changes for v2:
> - added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
> Changes for v3:
> - restore lr register in all 4 files.
> Only arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
>
> arch/arm/cpu/arm1136/start.S | 3 ++-
> arch/arm/cpu/arm1176/start.S | 4 +++-
> arch/arm/cpu/armv7/start.S | 3 ++-
> arch/arm/cpu/pxa/start.S | 3 ++-
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
> index eba2324..bccfdbf 100644
> --- a/arch/arm/cpu/arm1136/start.S
> +++ b/arch/arm/cpu/arm1136/start.S
> @@ -392,8 +392,9 @@ cpu_init_crit:
> str r0, [r13] @ save R0's value.
> ldr r0, IRQ_STACK_START_IN @ get data regions start
> 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
> diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
> index 3c291fb..694f79d 100644
> --- a/arch/arm/cpu/arm1176/start.S
> +++ b/arch/arm/cpu/arm1176/start.S
> @@ -480,9 +480,11 @@ phy_last_jump:
> /* save caller lr in position 0 of saved stack */
> str lr, [r0]
> /* get the spsr */
> - mrs r0, spsr
> + mrs lr, spsr
> /* save spsr in position 1 of saved stack */
> str lr, [r0, #4]
> + /* restore lr */
> + ldr lr, [r0]
> /* restore r0 */
> ldr r0, [r13]
> /* pop stack entry */
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index 36a4c3c..e5e157b 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -465,9 +465,10 @@ 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
> diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
> index 456a783..9c525e8 100644
> --- a/arch/arm/cpu/pxa/start.S
> +++ b/arch/arm/cpu/pxa/start.S
> @@ -387,8 +387,9 @@ cpu_init_crit:
> str r0, [r13] @ save R0's value.
> ldr r0, IRQ_STACK_START_IN @ get data regions start
> 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v3] BUGFIX: arm: data abort in get_bad_stack_swi
2013-04-05 10:12 ` [U-Boot] [PATCH v3] " Tetsuyuki Kobayashi
2013-04-11 9:47 ` Tetsuyuki Kobayashi
@ 2013-04-13 11:37 ` Albert ARIBAUD
1 sibling, 0 replies; 10+ messages in thread
From: Albert ARIBAUD @ 2013-04-13 11:37 UTC (permalink / raw)
To: u-boot
Hi Tetsuyuki,
On Fri, 5 Apr 2013 19:12:51 +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.
> But, actually it causes data abort accessing wrong address in get_bad_stack_swi
> macro in arch/arm/cpu/v7/start.S.
> This patch fixes this problem.
>
> The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.
>
> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
> ---
> Changes for v2:
> - added arch/arm/cpu/{arm1136,arm1176,pxa}/start.S
> Changes for v3:
> - restore lr register in all 4 files.
> Only arm/arm/cpu/armv7/start.S is tested on KZM-A9-GT board.
>
> arch/arm/cpu/arm1136/start.S | 3 ++-
> arch/arm/cpu/arm1176/start.S | 4 +++-
> arch/arm/cpu/armv7/start.S | 3 ++-
> arch/arm/cpu/pxa/start.S | 3 ++-
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
> index eba2324..bccfdbf 100644
> --- a/arch/arm/cpu/arm1136/start.S
> +++ b/arch/arm/cpu/arm1136/start.S
> @@ -392,8 +392,9 @@ cpu_init_crit:
> str r0, [r13] @ save R0's value.
> ldr r0, IRQ_STACK_START_IN @ get data regions start
> 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
> diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
> index 3c291fb..694f79d 100644
> --- a/arch/arm/cpu/arm1176/start.S
> +++ b/arch/arm/cpu/arm1176/start.S
> @@ -480,9 +480,11 @@ phy_last_jump:
> /* save caller lr in position 0 of saved stack */
> str lr, [r0]
> /* get the spsr */
> - mrs r0, spsr
> + mrs lr, spsr
> /* save spsr in position 1 of saved stack */
> str lr, [r0, #4]
> + /* restore lr */
> + ldr lr, [r0]
> /* restore r0 */
> ldr r0, [r13]
> /* pop stack entry */
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index 36a4c3c..e5e157b 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -465,9 +465,10 @@ 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
> diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
> index 456a783..9c525e8 100644
> --- a/arch/arm/cpu/pxa/start.S
> +++ b/arch/arm/cpu/pxa/start.S
> @@ -387,8 +387,9 @@ cpu_init_crit:
> str r0, [r13] @ save R0's value.
> ldr r0, IRQ_STACK_START_IN @ get data regions start
> 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 lr, [r0] @ restore lr
> ldr r0, [r13] @ restore r0
> add r13, r13, #4 @ pop stack entry
> .endm
Applied to u-boot-arm/master, thanks!
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-04-13 11:37 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 4:52 [U-Boot] [PATCH] BUGFIX: arm: armv7: data abort in get_bad_stack_swi Tetsuyuki Kobayashi
2013-04-04 6:21 ` Albert ARIBAUD
2013-04-04 6:24 ` Albert ARIBAUD
2013-04-04 10:29 ` Tetsuyuki Kobayashi
2013-04-05 1:45 ` [U-Boot] [PATCH v2] BUGFIX: arm: " Tetsuyuki Kobayashi
2013-04-05 7:04 ` Albert ARIBAUD
2013-04-05 10:04 ` Tetsuyuki Kobayashi
2013-04-05 10:12 ` [U-Boot] [PATCH v3] " Tetsuyuki Kobayashi
2013-04-11 9:47 ` Tetsuyuki Kobayashi
2013-04-13 11:37 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox