sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: Fix a bug in stack's "top" initialization 

Code-paths responsible for initializing CPU's stack pointer and variable
used in stack memory resource reservation got out of sync which resulted
in actual stack being 64K off from what "stack" struct resource
registered by arm_request_stack() thought it was.

At least one issue resulting from that can be easily triggered by
running:

memtest -t

This commit unifies the aforementioned code to a certain degree which
solves the problem and hopefuly makes it less likely to become an issue
again.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Andrey Smirnov 2016-12-18 22:05:52 -08:00 committed by Sascha Hauer
parent 51a2a8e7c9
commit bb9125c93e
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/entry.c
View File

@ -27,7 +27,7 @@
void __naked __noreturn barebox_arm_entry(unsigned long membase,
unsigned long memsize, void *boarddata)
{
arm_setup_stack(arm_mem_stack(membase, membase + memsize) + STACK_SIZE - 16);
arm_setup_stack(arm_mem_stack_top(membase, membase + memsize) - 16);
arm_early_mmu_cache_invalidate();
if (IS_ENABLED(CONFIG_PBL_MULTI_IMAGES))

2
arch/arm/cpu/start.c
View File

@ -158,7 +158,7 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize);
arm_stack_top = endmem;
arm_stack_top = arm_mem_stack_top(membase, endmem);
arm_barebox_size = barebox_size;
malloc_end = arm_mem_barebox_image(membase, endmem,
arm_barebox_size);

8
arch/arm/include/asm/barebox-arm.h
View File

@ -94,10 +94,16 @@ static inline void arm_fixup_vectors(void)
void *barebox_arm_boot_dtb(void);
static inline unsigned long arm_mem_stack_top(unsigned long membase,
unsigned long endmem)
{
return endmem - SZ_64K;
}
static inline unsigned long arm_mem_stack(unsigned long membase,
unsigned long endmem)
{
return endmem - SZ_64K - STACK_SIZE;
return arm_mem_stack_top(membase, endmem) - STACK_SIZE;
}
static inline unsigned long arm_mem_ttb(unsigned long membase,