提交 65c141eb 编写于 作者: P Patrick Delaunay 提交者: Tom Rini

board_f.c: Ensure 16 alignment of start_addr_sp and reserved memory

Add a function reserve_stack_aligned() to reserved memory with 16 bits
alignment after the stack pointer (gd->start_addr_sp) and use this new
function in board_f.c to reserve all the memory area (malloc, board, gd,
fdt, bootstage, stacks).

This 16 byte alignment is needed for cast on struct pointer
for the reserved memory, for example:
+ x86_64 ABI: https://reviews.llvm.org/D30049: 16 bytes
+ ARMv8 Instruction Set Overview: quad word, 16 bytes

An other alignment value could be needed for other architecture.
Signed-off-by: NPatrick Delaunay <patrick.delaunay@st.com>
Acked-by: NStephen Warren <swarren@nvidia.com>
上级 6de29923
...@@ -472,6 +472,17 @@ static int reserve_uboot(void) ...@@ -472,6 +472,17 @@ static int reserve_uboot(void)
return 0; return 0;
} }
/*
* reserve after start_addr_sp the requested size and make the stack pointer
* 16-byte aligned, this alignment is needed for cast on the reserved memory
* ref = x86_64 ABI: https://reviews.llvm.org/D30049: 16 bytes
* = ARMv8 Instruction Set Overview: quad word, 16 bytes
*/
static unsigned long reserve_stack_aligned(size_t size)
{
return ALIGN_DOWN(gd->start_addr_sp - size, 16);
}
#ifdef CONFIG_SYS_NONCACHED_MEMORY #ifdef CONFIG_SYS_NONCACHED_MEMORY
static int reserve_noncached(void) static int reserve_noncached(void)
{ {
...@@ -497,7 +508,7 @@ static int reserve_noncached(void) ...@@ -497,7 +508,7 @@ static int reserve_noncached(void)
/* reserve memory for malloc() area */ /* reserve memory for malloc() area */
static int reserve_malloc(void) static int reserve_malloc(void)
{ {
gd->start_addr_sp = gd->start_addr_sp - TOTAL_MALLOC_LEN; gd->start_addr_sp = reserve_stack_aligned(TOTAL_MALLOC_LEN);
debug("Reserving %dk for malloc() at: %08lx\n", debug("Reserving %dk for malloc() at: %08lx\n",
TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp); TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp);
#ifdef CONFIG_SYS_NONCACHED_MEMORY #ifdef CONFIG_SYS_NONCACHED_MEMORY
...@@ -511,7 +522,7 @@ static int reserve_malloc(void) ...@@ -511,7 +522,7 @@ static int reserve_malloc(void)
static int reserve_board(void) static int reserve_board(void)
{ {
if (!gd->bd) { if (!gd->bd) {
gd->start_addr_sp -= sizeof(bd_t); gd->start_addr_sp = reserve_stack_aligned(sizeof(bd_t));
gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t)); gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t));
memset(gd->bd, '\0', sizeof(bd_t)); memset(gd->bd, '\0', sizeof(bd_t));
debug("Reserving %zu Bytes for Board Info at: %08lx\n", debug("Reserving %zu Bytes for Board Info at: %08lx\n",
...@@ -530,7 +541,7 @@ static int setup_machine(void) ...@@ -530,7 +541,7 @@ static int setup_machine(void)
static int reserve_global_data(void) static int reserve_global_data(void)
{ {
gd->start_addr_sp -= sizeof(gd_t); gd->start_addr_sp = reserve_stack_aligned(sizeof(gd_t));
gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t)); gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
debug("Reserving %zu Bytes for Global Data at: %08lx\n", debug("Reserving %zu Bytes for Global Data at: %08lx\n",
sizeof(gd_t), gd->start_addr_sp); sizeof(gd_t), gd->start_addr_sp);
...@@ -548,7 +559,7 @@ static int reserve_fdt(void) ...@@ -548,7 +559,7 @@ static int reserve_fdt(void)
if (gd->fdt_blob) { if (gd->fdt_blob) {
gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32); gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
gd->start_addr_sp -= gd->fdt_size; gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size);
gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size);
debug("Reserving %lu Bytes for FDT at: %08lx\n", debug("Reserving %lu Bytes for FDT at: %08lx\n",
gd->fdt_size, gd->start_addr_sp); gd->fdt_size, gd->start_addr_sp);
...@@ -563,12 +574,7 @@ static int reserve_bootstage(void) ...@@ -563,12 +574,7 @@ static int reserve_bootstage(void)
#ifdef CONFIG_BOOTSTAGE #ifdef CONFIG_BOOTSTAGE
int size = bootstage_get_size(); int size = bootstage_get_size();
gd->start_addr_sp -= size; gd->start_addr_sp = reserve_stack_aligned(size);
/*
* Ensure that start_addr_sp is aligned down to reserve enough
* space for new_bootstage
*/
gd->start_addr_sp = ALIGN_DOWN(gd->start_addr_sp, 16);
gd->new_bootstage = map_sysmem(gd->start_addr_sp, size); gd->new_bootstage = map_sysmem(gd->start_addr_sp, size);
debug("Reserving %#x Bytes for bootstage at: %08lx\n", size, debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
gd->start_addr_sp); gd->start_addr_sp);
...@@ -585,8 +591,7 @@ __weak int arch_reserve_stacks(void) ...@@ -585,8 +591,7 @@ __weak int arch_reserve_stacks(void)
static int reserve_stacks(void) static int reserve_stacks(void)
{ {
/* make stack pointer 16-byte aligned */ /* make stack pointer 16-byte aligned */
gd->start_addr_sp -= 16; gd->start_addr_sp = reserve_stack_aligned(16);
gd->start_addr_sp &= ~0xf;
/* /*
* let the architecture-specific code tailor gd->start_addr_sp and * let the architecture-specific code tailor gd->start_addr_sp and
...@@ -598,8 +603,7 @@ static int reserve_stacks(void) ...@@ -598,8 +603,7 @@ static int reserve_stacks(void)
static int reserve_bloblist(void) static int reserve_bloblist(void)
{ {
#ifdef CONFIG_BLOBLIST #ifdef CONFIG_BLOBLIST
gd->start_addr_sp &= ~0xf; gd->start_addr_sp = reserve_stack_aligned(CONFIG_BLOBLIST_SIZE);
gd->start_addr_sp -= CONFIG_BLOBLIST_SIZE;
gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE); gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE);
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册