From 3293eb8e7305bc0cdaeb1359873576899c7e33e4 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 16 Feb 2011 16:41:24 -0200 Subject: [PATCH] [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 --- src/arch/i386/firmware/pcbios/memmap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c index 01080c7b..493d2c20 100644 --- a/src/arch/i386/firmware/pcbios/memmap.c +++ b/src/arch/i386/firmware/pcbios/memmap.c @@ -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] ) ) ) {