From 64049be508671bbd98e2c69bbe32a2434bc17b9d Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Fri, 20 Apr 2018 10:37:51 +0200 Subject: lib/bootmem: Add method to walk OS POV memory tables Add method to walk memory tables from OS point of view. The tables don't change when modifiying bootmem entries and doesn't contain bootmem specific tags. Change-Id: Iee332a9821d12a7d9a684063b77b0502febd8d7d Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/25747 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner Reviewed-by: Aaron Durbin --- src/lib/bootmem.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) (limited to 'src/lib') diff --git a/src/lib/bootmem.c b/src/lib/bootmem.c index ed45e0f384..7363a8b5cb 100644 --- a/src/lib/bootmem.c +++ b/src/lib/bootmem.c @@ -26,6 +26,7 @@ static int initialized; static int table_written; static struct memranges bootmem; +static struct memranges bootmem_os; static int bootmem_is_initialized(void) { @@ -66,6 +67,17 @@ static uint32_t bootmem_to_lb_tag(const enum bootmem_type tag) } } +static void bootmem_convert_ranges(void) +{ + /** + * Convert BM_MEM_RAMSTAGE and BM_MEM_PAYLOAD to BM_MEM_RAM and + * merge ranges. The payload doesn't care about memory used by firmware. + */ + memranges_clone(&bootmem_os, &bootmem); + memranges_update_tag(&bootmem_os, BM_MEM_RAMSTAGE, BM_MEM_RAM); + memranges_update_tag(&bootmem_os, BM_MEM_PAYLOAD, BM_MEM_RAM); +} + static void bootmem_init(void) { const unsigned long cacheable = IORESOURCE_CACHEABLE; @@ -91,6 +103,8 @@ static void bootmem_init(void) bootmem_arch_add_ranges(); bootmem_platform_add_ranges(); + + bootmem_convert_ranges(); } void bootmem_add_range(uint64_t start, uint64_t size, @@ -108,22 +122,13 @@ void bootmem_write_memory_table(struct lb_memory *mem) { const struct range_entry *r; struct lb_memory_range *lb_r; - struct memranges bm; lb_r = &mem->map[0]; bootmem_init(); bootmem_dump_ranges(); - /** - * Convert BM_MEM_RAMSTAGE and BM_MEM_PAYLOAD to BM_MEM_RAM and - * merge ranges. The payload doesn't care about memory used by firmware. - */ - memranges_clone(&bm, &bootmem); - memranges_update_tag(&bm, BM_MEM_RAMSTAGE, BM_MEM_RAM); - memranges_update_tag(&bm, BM_MEM_PAYLOAD, BM_MEM_RAM); - - memranges_each_entry(r, &bm) { + memranges_each_entry(r, &bootmem_os) { lb_r->start = pack_lb64(range_entry_base(r)); lb_r->size = pack_lb64(range_entry_size(r)); lb_r->type = bootmem_to_lb_tag(range_entry_tag(r)); @@ -132,8 +137,6 @@ void bootmem_write_memory_table(struct lb_memory *mem) mem->size += sizeof(struct lb_memory_range); } - memranges_teardown(&bm); - table_written = 1; } @@ -180,6 +183,20 @@ void bootmem_dump_ranges(void) } } +bool bootmem_walk_os_mem(range_action_t action, void *arg) +{ + const struct range_entry *r; + + assert(bootmem_is_initialized()); + + memranges_each_entry(r, &bootmem_os) { + if (!action(r, arg)) + return true; + } + + return false; +} + bool bootmem_walk(range_action_t action, void *arg) { const struct range_entry *r; -- cgit v1.2.3