[U-Boot,v2,1/9] powerpc, mpc8xx: clear top of stack
diff mbox series

Message ID c39985fe82cc900ce1769563833f63dd50be2d4e.1542749104.git.christophe.leroy@c-s.fr
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,v2,1/9] powerpc, mpc8xx: clear top of stack
Related show

Commit Message

Christophe Leroy Nov. 21, 2018, 8:51 a.m. UTC
Reported-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/cpu/mpc8xx/start.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Joakim Tjernlund Nov. 21, 2018, 9:42 a.m. UTC | #1
On Wed, 2018-11-21 at 08:51 +0000, Christophe Leroy wrote:
> 
> Reported-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>

Leroy, if you need space, you may want to revive:
 https://github.com/u-boot/u-boot/commit/39768f7715ed637ef02f49fc7de664cc1aaf14b3#diff-e2f25eeee512eac55747ede53068dd1e
it got reverted as some odd 8xx boards broke. I think these are gone now.

 Jocke
> ---
>  arch/powerpc/cpu/mpc8xx/start.S | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
> index 8dde4beeea1..b8bdaaec2fa 100644
> --- a/arch/powerpc/cpu/mpc8xx/start.S
> +++ b/arch/powerpc/cpu/mpc8xx/start.S
> @@ -144,9 +144,11 @@ in_flash:
>         ori     r2, r2, CONFIG_SYS_DER@l
>         mtspr   DER, r2
> 
> -       /* set up the stack in internal DPRAM */
> +       /* set up the stack on top of internal DPRAM */
>         lis     r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@h
>         ori     r3, r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@l
> +       stw     r0, -4(r3)
> +       stw     r0, -8(r3)
>         addi    r1, r3, -8
> 
>         bl      board_init_f_alloc_reserve
> --
> 2.13.3
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Tom Rini Dec. 3, 2018, 10:50 p.m. UTC | #2
On Wed, Nov 21, 2018 at 08:51:41AM +0000, Christophe Leroy wrote:

> Reported-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index 8dde4beeea1..b8bdaaec2fa 100644
--- a/arch/powerpc/cpu/mpc8xx/start.S
+++ b/arch/powerpc/cpu/mpc8xx/start.S
@@ -144,9 +144,11 @@  in_flash:
 	ori	r2, r2, CONFIG_SYS_DER@l
 	mtspr	DER, r2
 
-	/* set up the stack in internal DPRAM */
+	/* set up the stack on top of internal DPRAM */
 	lis	r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@h
 	ori	r3, r3, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)@l
+	stw	r0, -4(r3)
+	stw	r0, -8(r3)
 	addi	r1, r3, -8
 
 	bl	board_init_f_alloc_reserve