mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-26 16:21:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

board_f.c: Ensure gd->new_bootstage alignment

Browse Source 
In reserve_bootstage(), in case size is odd, gd->new_bootstage
is not aligned. In bootstage_relocate(), the platform hangs when
getting access to data->record[i].name.
To avoid this issue, make gd->new_bootstage 16 byte aligned.

To ensure that new_bootstage is 16 byte aligned (at least needed for
x86_64 and ARMv8) and new_bootstage starts down to get enough space,
ALIGN_DOWN macro is used.

Fixes: ac9cd4805c8b ("bootstage: Correct relocation algorithm")

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Vikas MANOCHA <vikas.manocha@st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
Tested-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrice Chotard 2020-03-10 10:15:02 +01:00 committed by Tom Rini
parent 9d82cbd39a
commit a6651086a7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/board_f.c
View File

@ -564,6 +564,11 @@ static int reserve_bootstage(void)
int size = bootstage_get_size(); int size = bootstage_get_size();
gd->start_addr_sp -= size; gd->start_addr_sp -= 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);