diff options
| author | Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> | 2019-11-11 22:30:46 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-10 10:25:13 -0500 |
| commit | c82abaa5d63f5259fd64c59bd70010310b4c4e4b (patch) | |
| tree | 7b886c981a43ab45c1481d4ef911377379102514 /common/init/board_init.c | |
| parent | 8947145cd0ae8adf1c5dc0ae6756d49bf5330b48 (diff) | |
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 <simon.k.r.goldschmidt@gmail.com>
Diffstat (limited to 'common/init/board_init.c')
| -rw-r--r-- | common/init/board_init.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index e52106966d..3bc7994586 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -19,6 +19,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 * stack-checking markers. @@ -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); |