david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[pcbios] Merge adjacent memory regions of same type 

Some BIOSes can report multiple memory regions which may be adjacent
and the same type.  Since only the first region is used in the
mboot.c32 layer it's possible to run out of memory when loading all of
the boot modules.  One may get around this problem by having iPXE
merge these memory regions internally.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Eduardo Habkost 2011-02-16 16:41:24 -02:00 committed by Michael Brown
parent 72d387eac1
commit 3293eb8e73
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/i386/firmware/pcbios/memmap.c
View File

@ -156,6 +156,7 @@ unsigned int extmemsize ( void ) {
*/
static int meme820 ( struct memory_map *memmap ) {
struct memory_region *region = memmap->regions;
struct memory_region *prev_region = NULL;
uint32_t next = 0;
uint32_t smap;
size_t size;
@ -238,8 +239,15 @@ static int meme820 ( struct memory_map *memmap ) {
region->start = e820buf.start;
region->end = e820buf.start + e820buf.len;
region++;
memmap->count++;
/* Check for adjacent regions and merge them */
if ( prev_region && ( region->start == prev_region->end ) ) {
prev_region->end = region->end;
} else {
prev_region = region;
region++;
memmap->count++;
}
if ( memmap->count >= ( sizeof ( memmap->regions ) /
sizeof ( memmap->regions[0] ) ) ) {