Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39810 )
Change subject: memranges: Change align attribute to be log2 of required alignment ......................................................................
memranges: Change align attribute to be log2 of required alignment
This change updates the align attribute of memranges to be represented as log2 of the required alignment. This makes it consistent with how alignment is stored in struct resource as well.
Additionally, since memranges only allow power of 2 alignments, this change allows getting rid of checks at runtime and hence failure cases for non-power of 2 alignments.
BUG=b:149186922
Signed-off-by: Furquan Shaikh furquan@google.com Change-Id: Ie4d3868cdff55b2c7908b9b3ccd5f30a5288e62f --- M src/include/memrange.h M src/lib/memrange.c 2 files changed, 12 insertions(+), 21 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/39810/1
diff --git a/src/include/memrange.h b/src/include/memrange.h index cfd29e7..97669fb 100644 --- a/src/include/memrange.h +++ b/src/include/memrange.h @@ -15,6 +15,7 @@ #define MEMRANGE_H_
#include <device/resource.h> +#include <lib.h> #include <stdbool.h>
/* A memranges structure consists of a list of range_entry(s). The structure @@ -24,7 +25,7 @@ /* coreboot doesn't have a free() function. Therefore, keep a cache of * free'd entries. */ struct range_entry *free_list; - /* Alignment for base and end addresses of the range. (Must be power of 2). */ + /* Alignment(log 2) for base and end addresses of the range. */ size_t align; };
@@ -96,7 +97,7 @@
/* Initialize memranges structure providing an optional array of range_entry * to use as the free list. Additionally, it accepts an align parameter that - * determines the alignment of addresses. (Alignment must be a power of 2). */ + * represents the required alignment(log 2) of addresses. */ void memranges_init_empty_with_alignment(struct memranges *ranges, struct range_entry *free, size_t num_free, size_t align); @@ -104,7 +105,7 @@ /* Initialize and fill a memranges structure according to the * mask and match type for all memory resources. Tag each entry with the * specified type. Additionally, it accepts an align parameter that - * determines the alignment of addresses. (Alignment must be a power of 2). */ + * represents the required alignment(log 2) of addresses. */ void memranges_init_with_alignment(struct memranges *ranges, unsigned long mask, unsigned long match, unsigned long tag, size_t align); @@ -112,13 +113,13 @@ /* Initialize memranges structure providing an optional array of range_entry * to use as the free list. Addresses are default aligned to 4KiB. */ #define memranges_init_empty(__ranges, __free, __num_free) \ - memranges_init_empty_with_alignment(__ranges, __free, __num_free, 4 * KiB) + memranges_init_empty_with_alignment(__ranges, __free, __num_free, log2(4 * KiB))
/* Initialize and fill a memranges structure according to the * mask and match type for all memory resources. Tag each entry with the * specified type. Addresses are default aligned to 4KiB. */ #define memranges_init(__ranges, __mask, __match, __tag) \ - memranges_init_with_alignment(__ranges, __mask, __match, __tag, 4 * KiB) + memranges_init_with_alignment(__ranges, __mask, __match, __tag, log2(4 * KiB))
/* Clone a memrange. The new memrange has the same entries as the old one. */ void memranges_clone(struct memranges *newranges, struct memranges *oldranges); @@ -175,8 +176,7 @@ /* Steals memory from the available list in given ranges as per the constraints: * limit = Upper bound for the memory range to steal. * size = Requested size for the stolen memory. - * align = Alignment requirements for the starting address of the stolen memory. - * (Alignment must be a power of 2). + * align = Required alignment(log 2) for the starting address of the stolen memory. * tag = Use a range that matches the given tag. * * If the constraints can be satisfied, this function creates a hole in the memrange, diff --git a/src/lib/memrange.c b/src/lib/memrange.c index 5fb40df..f3cb907 100644 --- a/src/lib/memrange.c +++ b/src/lib/memrange.c @@ -230,12 +230,12 @@ if (size == 0) return;
- /* The addresses are aligned to 4096 bytes: the begin address is + /* The addresses are aligned to ranges->align bytes: the begin address is * aligned down while the end address is aligned up to be conservative * about the full range covered. */ - begin = ALIGN_DOWN(base, ranges->align); + begin = ALIGN_DOWN(base, 1 << ranges->align); end = begin + size + (base - begin); - end = ALIGN_UP(end, ranges->align) - 1; + end = ALIGN_UP(end, 1 << ranges->align) - 1; action(ranges, begin, end, tag); }
@@ -298,9 +298,6 @@ { size_t i;
- /* Alignment must be a power of 2. */ - assert(IS_POWER_OF_2(align)); - ranges->entries = NULL; ranges->free_list = NULL; ranges->align = align; @@ -403,18 +400,12 @@ if (size == 0) return NULL;
- if (!IS_POWER_OF_2(align)) - return NULL; - - if (!IS_ALIGNED(align, ranges->align)) - return NULL; - memranges_each_entry(r, ranges) {
if (r->tag != tag) continue;
- base = ALIGN_UP(r->begin, align); + base = ALIGN_UP(r->begin, 1 << align); end = base + size - 1;
if (end > r->end) @@ -438,7 +429,7 @@ if (r == NULL) return false;
- base = ALIGN_UP(r->begin, align); + base = ALIGN_UP(r->begin, 1 << align);
memranges_create_hole(ranges, base, size); *stolen_base = base;