erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

selfboot: Move the usable-RAM check into a function

Browse source 
In preparation for making this check optional, move it into its own
function. load_self_segments() is already long and we don't want to make
it longer.

BUG=chrome-os-partner:56314
BRANCH=none
TEST=boot on gru and see that BL31 loads and runs correctly

Change-Id: I005e5e4d9b2136605bdd95e9060655df7a8238cb
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/381092
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Simon Glass 2016-09-04 16:37:04 -06:00 • committed by chrome-bot
commit 2381e02efa
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/selfboot.c
View file

@ -328,23 +328,20 @@ static int build_self_segment_list(
return 1;
}
static int load_self_segments(
struct segment *head,
struct prog *payload)
static int payload_targets_usable_ram(struct segment *head)
{
struct segment *ptr;
const unsigned long one_meg = (1UL << 20);
unsigned long bounce_high = lb_end;
struct segment *ptr;
for(ptr = head->next; ptr != head; ptr = ptr->next) {
for (ptr = head->next; ptr != head; ptr = ptr->next) {
if (bootmem_region_targets_usable_ram(ptr->s_dstaddr,
ptr->s_memsz))
ptr->s_memsz))
continue;
if (ptr->s_dstaddr < one_meg &&
(ptr->s_dstaddr + ptr->s_memsz) <= one_meg) {
printk(BIOS_DEBUG,
"Payload being loaded below 1MiB "
"Payload being loaded at below 1MiB "
"without region being marked as RAM usable.\n");
continue;
}
@ -357,6 +354,19 @@ static int load_self_segments(
return 0;
}
return 1;
}
static int load_self_segments(
struct segment *head,
struct prog *payload)
{
struct segment *ptr;
unsigned long bounce_high = lb_end;
if (!payload_targets_usable_ram(head))
return 0;
for(ptr = head->next; ptr != head; ptr = ptr->next) {
/*
* Add segments to bootmem memory map before a bounce buffer is