Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common/board_f: Catch bloblist before starting reservations

Browse source 
Start reservations needed for init sequence only after catching
bloblists from previous stage.

This is to avoid catching bloblists in the middle causing gaps while
u-boot is reserving.

Adjust the relocaddr as per video hand-off information received from
previous stage so that further reservations start only after regions
reserved for previous stages

Skip reservation for video memory if it was already filled by a
bloblist.

Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Devarsh Thakkar 2023-12-05 21:25:19 +05:30 • committed by Tom Rini
parent 945053fd64
commit 4ef9c77248
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/board_f.c
View file

@ -403,7 +403,7 @@ __weak int arch_reserve_mmu(void)
return 0; return 0;
} }
static int reserve_video(void) static int reserve_video_from_videoblob(void)
{ {
if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) { if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) {
struct video_handoff *ho; struct video_handoff *ho;
@ -412,8 +412,34 @@ static int reserve_video(void)
if (!ho) if (!ho)
return log_msg_ret("blf", -ENOENT); return log_msg_ret("blf", -ENOENT);
video_reserve_from_bloblist(ho); video_reserve_from_bloblist(ho);
gd->relocaddr = ho->fb;
} else if (CONFIG_IS_ENABLED(VIDEO)) { /* Sanity check fb from blob is before current relocaddr */
if (likely(gd->relocaddr > (unsigned long)ho->fb))
gd->relocaddr = ho->fb;
}
return 0;
}
/*
* Check if any bloblist received specifying reserved areas from previous stage and adjust
* gd->relocaddr accordingly, so that we start reserving after pre-reserved areas
* from previous stage.
*
* NOTE:
* IT is recommended that all bloblists from previous stage are reserved from ram_top
* as next stage will simply start reserving further regions after them.
*/
static int setup_relocaddr_from_bloblist(void)
{
reserve_video_from_videoblob();
return 0;
}
static int reserve_video(void)
{
if (CONFIG_IS_ENABLED(VIDEO)) {
ulong addr; ulong addr;
int ret; int ret;
@ -923,6 +949,7 @@ static const init_fnc_t init_sequence_f[] = {
reserve_pram, reserve_pram,
#endif #endif
reserve_round_4k, reserve_round_4k,
setup_relocaddr_from_bloblist,
arch_reserve_mmu, arch_reserve_mmu,
reserve_video, reserve_video,
reserve_trace, reserve_trace,