diff options
| -rw-r--r-- | src/include/memrange.h | 9 | ||||
| -rw-r--r-- | src/lib/memrange.c | 57 |
2 files changed, 40 insertions, 26 deletions
diff --git a/src/include/memrange.h b/src/include/memrange.h index 9e8c70457a..a4f7742c5b 100644 --- a/src/include/memrange.h +++ b/src/include/memrange.h @@ -21,6 +21,9 @@ * is exposed so that a memranges can be used on the stack if needed. */ struct memranges { struct range_entry *entries; + /* Coreboot doesn't have a free() function. Therefore, keep a cache of + * free'd entries. */ + struct range_entry *free_list; }; /* Each region within a memranges structure is represented by a @@ -71,8 +74,10 @@ static inline void range_entry_update_tag(struct range_entry *r, #define memranges_each_entry(r, ranges) \ for (r = (ranges)->entries; r != NULL; r = r->next) -/* Initialize memranges structure */ -void memranges_init_empty(struct memranges *ranges); +/* Initialize memranges structure providing an optional array of range_entry + * to use as the free list. */ +void memranges_init_empty(struct memranges *ranges, struct range_entry *free, + size_t num_free); /* Initialize and fill a memranges structure according to the * mask and match type for all memory resources. Tag each entry with the diff --git a/src/lib/memrange.c b/src/lib/memrange.c index b2839d09dc..cc75e01c26 100644 --- a/src/lib/memrange.c +++ b/src/lib/memrange.c @@ -16,10 +16,6 @@ #include <console/console.h> #include <memrange.h> -/* Coreboot doesn't have a free() function. Therefore, keep a cache of - * free'd entries. */ -static struct range_entry *free_list; - static inline void range_entry_link(struct range_entry **prev_ptr, struct range_entry *r) { @@ -34,32 +30,35 @@ static inline void range_entry_unlink(struct range_entry **prev_ptr, r->next = NULL; } -static inline void range_entry_unlink_and_free(struct range_entry **prev_ptr, +static inline void range_entry_unlink_and_free(struct memranges *ranges, + struct range_entry **prev_ptr, struct range_entry *r) { range_entry_unlink(prev_ptr, r); - range_entry_link(&free_list, r); + range_entry_link(&ranges->free_list, r); } -static struct range_entry *alloc_range(void) +static struct range_entry *alloc_range(struct memranges *ranges) { - if (free_list != NULL) { + if (ranges->free_list != NULL) { struct range_entry *r; - r = free_list; - range_entry_unlink(&free_list, r); + r = ranges->free_list; + range_entry_unlink(&ranges->free_list, r); return r; } - return malloc(sizeof(struct range_entry)); + if (ENV_RAMSTAGE) + return malloc(sizeof(struct range_entry)); + return NULL; } static inline struct range_entry * -range_list_add(struct range_entry **prev_ptr, resource_t begin, resource_t end, - unsigned long tag) +range_list_add(struct memranges *ranges, struct range_entry **prev_ptr, + resource_t begin, resource_t end, unsigned long tag) { struct range_entry *new_entry; - new_entry = alloc_range(); + new_entry = alloc_range(ranges); if (new_entry == NULL) { printk(BIOS_ERR, "Could not allocate range_entry!\n"); return NULL; @@ -91,7 +90,7 @@ static void merge_neighbor_entries(struct memranges *ranges) * the list. */ if (prev->end + 1 >= cur->begin && prev->tag == cur->tag) { prev->end = cur->end; - range_entry_unlink_and_free(&prev->next, cur); + range_entry_unlink_and_free(ranges, &prev->next, cur); /* Set cur to prev so cur->next is valid since cur * was just unlinked and free. */ cur = prev; @@ -136,7 +135,8 @@ static void remove_memranges(struct memranges *ranges, /* Full removal. */ if (end >= cur->end) { begin = cur->end + 1; - range_entry_unlink_and_free(prev_ptr, cur); + range_entry_unlink_and_free(ranges, prev_ptr, + cur); continue; } } @@ -151,7 +151,8 @@ static void remove_memranges(struct memranges *ranges, /* Hole punched in middle of entry. */ if (begin > cur->begin && tmp_end < cur->end) { - range_list_add(&cur->next, end + 1, cur->end, cur->tag); + range_list_add(ranges, &cur->next, end + 1, cur->end, + cur->tag); cur->end = begin - 1; break; } @@ -196,7 +197,7 @@ static void merge_add_memranges(struct memranges *ranges, } /* Add new entry and merge with neighbors. */ - range_list_add(prev_ptr, begin, end, tag); + range_list_add(ranges, prev_ptr, begin, end, tag); merge_neighbor_entries(ranges); } @@ -289,23 +290,31 @@ void memranges_add_resources(struct memranges *ranges, memranges_add_resources_filter(ranges, mask, match, tag, NULL); } -void memranges_init_empty(struct memranges *ranges) +void memranges_init_empty(struct memranges *ranges, struct range_entry *free, + size_t num_free) { + size_t i; + ranges->entries = NULL; + ranges->free_list = NULL; + + for (i = 0; i < num_free; i++) + range_entry_link(&ranges->free_list, &free[i]); } void memranges_init(struct memranges *ranges, unsigned long mask, unsigned long match, unsigned long tag) { - memranges_init_empty(ranges); + memranges_init_empty(ranges, NULL, 0); memranges_add_resources(ranges, mask, match, tag); } void memranges_teardown(struct memranges *ranges) { while (ranges->entries != NULL) { - range_entry_unlink_and_free(&ranges->entries, ranges->entries); + range_entry_unlink_and_free(ranges, &ranges->entries, + ranges->entries); } } @@ -331,8 +340,8 @@ void memranges_fill_holes_up_to(struct memranges *ranges, end = cur->begin - 1; if (end >= limit) end = limit - 1; - range_list_add(&prev->next, range_entry_end(prev), - end, tag); + range_list_add(ranges, &prev->next, + range_entry_end(prev), end, tag); } prev = cur; @@ -346,7 +355,7 @@ void memranges_fill_holes_up_to(struct memranges *ranges, /* Handle the case where the limit was never reached. A new entry needs * to be added to cover the range up to the limit. */ if (prev != NULL && range_entry_end(prev) < limit) - range_list_add(&prev->next, range_entry_end(prev), + range_list_add(ranges, &prev->next, range_entry_end(prev), limit - 1, tag); /* Merge all entries that were newly added. */ |