GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix payload loading in various corner cases when working 

with the bounce buffer.
In particular, the not-so-rare configuration of AMD boards with RAMBASE at
2MB shouldn't crash anymore for payloads that take > 1MB in total

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4697 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2009-09-30 21:36:38 +00:00
parent aeab4fcca0
commit 26dd71c2d7
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/boot/selfboot.c
View File

@ -423,14 +423,13 @@ static int load_self_segments(
{ {
struct segment *ptr; struct segment *ptr;
unsigned long required_bounce_size = lb_end - lb_start; unsigned long bounce_high = lb_end;
for(ptr = head->next; ptr != head; ptr = ptr->next) { for(ptr = head->next; ptr != head; ptr = ptr->next) {
if (!overlaps_coreboot(ptr)) continue; if (!overlaps_coreboot(ptr)) continue;
unsigned long bounce = ptr->s_dstaddr + ptr->s_memsz - lb_start; if (ptr->s_dstaddr + ptr->s_memsz > bounce_high)
if (bounce > required_bounce_size) bounce_high = ptr->s_dstaddr + ptr->s_memsz;
required_bounce_size = bounce;
} }
get_bounce_buffer(mem, required_bounce_size); get_bounce_buffer(mem, bounce_high - lb_start);
if (!bounce_buffer) { if (!bounce_buffer) {
printk_err("Could not find a bounce buffer...\n"); printk_err("Could not find a bounce buffer...\n");
return 0; return 0;
@ -502,6 +501,24 @@ static int load_self_segments(
/* Zero the extra bytes */ /* Zero the extra bytes */
memset(middle, 0, end - middle); memset(middle, 0, end - middle);
} }
/* Copy the data that's outside the area that shadows coreboot_ram */
printk_debug("dest %lx, end %lx, bouncebuffer %lx\n", dest, end, bounce_buffer);
if ((unsigned long)end > bounce_buffer) {
if ((unsigned long)dest < bounce_buffer) {
unsigned long from = dest;
unsigned long to = lb_start-(bounce_buffer-(unsigned long)dest);
unsigned long amount = bounce_buffer-(unsigned long)dest;
printk_debug("move prefix around: from %lx, to %lx, amount: %lx\n", from, to, amount);
memcpy(to, from, amount);
}
if ((unsigned long)end > bounce_buffer + (lb_end - lb_start)) {
unsigned long from = bounce_buffer + (lb_end - lb_start);
unsigned long to = lb_end;
unsigned long amount = end - from;
printk_debug("move suffix around: from %lx, to %lx, amount: %lx\n", from, to, amount);
memcpy(to, from, amount);
}
}
} }
} }
return 1; return 1;