diff mbox series

[2/2] microblaze: start.S: Use board_init_f_alloc/init in early init

Message ID 20200920165023.6227-2-ovidiu.panait@windriver.com
State New
Delegated to: Michal Simek
Headers show
Series [1/2] microblaze: start.S: Factor out exception setup code to __setup_exceptions | expand

Commit Message

Ovidiu Panait Sept. 20, 2020, 4:50 p.m. UTC
Implement early init by calling generic board_init_f_alloc_reserve and
board_init_f_init_reserve functions:
* drop SYS_MALLOC_F_LEN related code, as allocation and gd->malloc_base
  assignment are taken care of by the generic functions
* drop _gd logic

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---

 arch/microblaze/cpu/start.S | 45 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

Comments

Michal Simek Sept. 23, 2020, 2:46 p.m. UTC | #1
On 20. 09. 20 18:50, Ovidiu Panait wrote:
> Implement early init by calling generic board_init_f_alloc_reserve and
> board_init_f_init_reserve functions:
> * drop SYS_MALLOC_F_LEN related code, as allocation and gd->malloc_base
>   assignment are taken care of by the generic functions
> * drop _gd logic
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> ---
> 
>  arch/microblaze/cpu/start.S | 45 ++++++++++++++++++-------------------
>  1 file changed, 22 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
> index f3be014317..1f580b1112 100644
> --- a/arch/microblaze/cpu/start.S
> +++ b/arch/microblaze/cpu/start.S
> @@ -17,25 +17,40 @@ _start:
>  
>  	addi	r8, r0, __end
>  	mts	rslr, r8
> -	/* TODO: Redo this code to call board_init_f_*() */
> +
>  #if defined(CONFIG_SPL_BUILD)
>  	addi	r1, r0, CONFIG_SPL_STACK_ADDR
> -	mts	rshr, r1
> -	addi	r1, r1, -4	/* Decrement SP to top of memory */
> -#else
> -#if CONFIG_VAL(SYS_MALLOC_F_LEN)
> -	addi	r1, r0, CONFIG_SYS_INIT_SP_OFFSET - CONFIG_VAL(SYS_MALLOC_F_LEN)
>  #else
>  	addi	r1, r0, CONFIG_SYS_INIT_SP_OFFSET
>  #endif
> +
>  	mts	rshr, r1
>  	addi	r1, r1, -4	/* Decrement SP to top of memory */

You are setting stack high protection in below code that's why no need
to call it twice here but


>  
> +	/* Call board_init_f_alloc_reserve with the current stack pointer as
> +	 * parameter. */
> +	add	r5, r0, r1
> +	bralid	r15, board_init_f_alloc_reserve
> +	nop

In SPL case this will decrease stack by SYS_MALLOC_F_LEN which is wrong.

This should be fine if you remove CONFIG_SYS_MALLOC_F_LEN from
CONFIG_SPL_STACK_ADDR then behavior will remain the same as was before.
(there is one more rounddown in board_init_f_alloc_reserve() but that
should be fine.

215 # define CONFIG_SPL_STACK_ADDR          (CONFIG_SYS_INIT_RAM_ADDR + \
216                                          CONFIG_SYS_INIT_RAM_SIZE - \
217                                          CONFIG_SYS_MALLOC_F_LEN)


The rest of code looks good to me.

Thanks,
Michal
diff mbox series

Patch

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index f3be014317..1f580b1112 100644
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -17,25 +17,40 @@  _start:
 
 	addi	r8, r0, __end
 	mts	rslr, r8
-	/* TODO: Redo this code to call board_init_f_*() */
+
 #if defined(CONFIG_SPL_BUILD)
 	addi	r1, r0, CONFIG_SPL_STACK_ADDR
-	mts	rshr, r1
-	addi	r1, r1, -4	/* Decrement SP to top of memory */
-#else
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	addi	r1, r0, CONFIG_SYS_INIT_SP_OFFSET - CONFIG_VAL(SYS_MALLOC_F_LEN)
 #else
 	addi	r1, r0, CONFIG_SYS_INIT_SP_OFFSET
 #endif
+
 	mts	rshr, r1
 	addi	r1, r1, -4	/* Decrement SP to top of memory */
 
+	/* Call board_init_f_alloc_reserve with the current stack pointer as
+	 * parameter. */
+	add	r5, r0, r1
+	bralid	r15, board_init_f_alloc_reserve
+	nop
+
+	/* board_init_f_alloc_reserve returns a pointer to the allocated area
+	 * in r3. Set the new stack pointer below this area. */
+	add	r1, r0, r3
+	mts	rshr, r1
+	addi	r1, r1, -4
+
+	/* Call board_init_f_init_reserve with the address returned by
+	 * board_init_f_alloc_reserve as parameter. */
+	add	r5, r0, r3
+	bralid	r15, board_init_f_init_reserve
+	nop
+
+#if !defined(CONFIG_SPL_BUILD)
 	/* Setup vectors with pre-relocation symbols */
 	or r5, r0, r0
 	bralid r15, __setup_exceptions
 	nop
-#endif /* CONFIG_SPL_BUILD */
+#endif
 
 	/* Flush cache before enable cache */
 	addik	r5, r0, 0
@@ -48,7 +63,6 @@  _start:
 	ori	r12, r12, 0x1a0
 	mts	rmsr, r12
 
-	/* TODO: Redo this code to call board_init_f_*() */
 clear_bss:
 	/* clear BSS segments */
 	addi	r5, r0, __bss_start
@@ -67,27 +81,12 @@  clear_bss:
 #endif
 #ifndef CONFIG_SPL_BUILD
 	or	r5, r0, r0	/* flags - empty */
-	addi    r31, r0, _gd
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	addi	r6, r0, CONFIG_SYS_INIT_SP_OFFSET
-	swi	r6, r31, GD_MALLOC_BASE
-#endif
 	brai	board_init_f
 #else
-	addi	r31, r0, _gd
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	addi	r6, r0, CONFIG_SPL_STACK_ADDR
-	swi	r6, r31, GD_MALLOC_BASE
-#endif
 	brai	board_init_r
 #endif
 1:	bri	1b
 
- .section .bss
-.align 4
-_gd:
-         .space  GENERATED_GBL_DATA_SIZE
-
 #ifndef CONFIG_SPL_BUILD
 	.text
 	.ent	__setup_exceptions