mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: e820: use the lmb API for adding RAM memory

Browse Source 
The EFI_CONVENTIONAL_MEMORY type is now being managed through the LMB
module. Add a separate function, lmb_arch_add_memory() to add the RAM
memory to the LMB memory map. The efi_add_known_memory() function is
now used for adding any other memory type to the EFI memory map.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
This commit is contained in:
Sughosh Ganu 2024-10-15 21:07:13 +05:30 committed by Tom Rini
parent 9ec4065557
commit ad33ce2e6c
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
arch/x86/lib/e820.c
View File

@ -4,6 +4,7 @@
*/
#include <efi_loader.h>
#include <lmb.h>
#include <asm/e820.h>
#include <asm/global_data.h>
@ -41,15 +42,11 @@ void efi_add_known_memory(void)
{
struct e820_entry e820[E820MAX];
unsigned int i, num;
u64 start, ram_top;
u64 start;
int type;
num = install_e820_map(ARRAY_SIZE(e820), e820);
ram_top = (u64)gd->ram_top & ~EFI_PAGE_MASK;
if (!ram_top)
ram_top = 0x100000000ULL;
for (i = 0; i < num; ++i) {
start = e820[i].addr;
@ -72,13 +69,41 @@ void efi_add_known_memory(void)
break;
}
if (type == EFI_CONVENTIONAL_MEMORY) {
efi_add_conventional_memory_map(start,
start + e820[i].size,
ram_top);
} else {
if (type != EFI_CONVENTIONAL_MEMORY)
efi_add_memory_map(start, e820[i].size, type);
}
}
}
#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */
#if CONFIG_IS_ENABLED(LMB_ARCH_MEM_MAP)
void lmb_arch_add_memory(void)
{
struct e820_entry e820[E820MAX];
unsigned int i, num;
u64 ram_top;
num = install_e820_map(ARRAY_SIZE(e820), e820);
ram_top = (u64)gd->ram_top & ~EFI_PAGE_MASK;
if (!ram_top)
ram_top = 0x100000000ULL;
for (i = 0; i < num; ++i) {
if (e820[i].type == E820_RAM) {
u64 start, size, rgn_top;
start = e820[i].addr;
size = e820[i].size;
rgn_top = start + size;
if (start > ram_top)
continue;
if (rgn_top > ram_top)
size -= rgn_top - ram_top;
lmb_add(start, size);
}
}
}
#endif /* CONFIG_IS_ENABLED(LMB_ARCH_MEM_MAP) */

2
lib/Kconfig
View File

@ -1122,7 +1122,7 @@ config SPL_LMB
config LMB_ARCH_MEM_MAP
bool "Add an architecture specific memory map"
depends on LMB
default y if FSL_LAYERSCAPE
default y if FSL_LAYERSCAPE || X86
help
Some architectures have special or unique aspects which need
consideration when adding memory ranges to the list of available