spl: fix stack usage check if gd is not initialized
PATCH 1/1 spl: fix stack usage check if gd is not initialized
Most platforms do not set up gd->start_addr_sp in SPL. Since this is required for CONFIG_SPL_SYS_REPORT_SACK_F_USAGE to work correctly, set up gd->start_addr_sp in SPL to the value passed to board_init_f_init_reserve if it is not set yet.
Fixes d8c0332031 ("spl: implement stack usage check")
Signed-off-by Simon Goldschmidt <[email protected]>
---
common/init/board_init.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
common/init/board_init.c +17 -0
@@ -18,6 +18,19 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) }#endif /* !CONFIG_X86 && !CONFIG_ARM */ +/** +* This function is called from board_init_f_init_reserve to set up +* gd->start_addr_sp for stack protection if not already set otherwise +*/ +__weak void board_init_f_init_stack_protection_addr (ulong base) +{ +#if CONFIG_IS_ENABLED (SYS_REPORT_STACK_F_USAGE ) +/* set up stack pointer for stack usage if not set yet */ +if (!gd->start_addr_sp) + gd->start_addr_sp = base; +#endif +} +/** * This function is called after the position of the initial stack is * determined in gd->start_addr_sp. Boards can override it to set up
@@ -129,6 +142,10 @@ void board_init_f_init_reserve(ulong base)#if !defined(CONFIG_ARM )arch_setup_gd (gd_ptr);#endif + +if (CONFIG_IS_ENABLED (SYS_REPORT_STACK_F_USAGE )) +board_init_f_init_stack_protection_addr (base); +/* next alloc will be higher by one GD plus 16-byte alignment */ base +=roundup (sizeof (struct global_data ),16 );
Signature · 1 line
2.20.1
PATCH 1/1 spl: fix stack usage check if gd is not initialized
Quoted 7 lines · Simon Goldschmidt
Most platforms do not set up
gd->start_addr_spin SPL. Since this is required forCONFIG_SPL_SYS_REPORT_SACK_F_USAGEto work correctly, set upgd->start_addr_spin SPL to the value passed toboard_init_f_init_reserveif it is not set yet.Fixes d8c0332031 ("spl: implement stack usage check")Signed-off-by Simon Goldschmidt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/08197518/attachment.sig>