| Message ID | 20220809091558.14379-3-alexandru.elisei@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm/arm64: Rework cache maintenance at boot | expand |
On Tue, Aug 09, 2022 at 10:15:41AM +0100, Alexandru Elisei wrote: > Commit 11c4715fbf87 ("alloc: implement free") changed align_min from a > static variable to a field for the alloc_ops struct and carried over the > initializer value of DEFAULT_MINIMUM_ALIGNMENT. > > Commit 7e3e823b78c0 ("lib/alloc.h: remove align_min from struct > alloc_ops") removed the align_min field and changed it back to a static > variable, but missed initializing it. > > Initialize align_min to DEFAULT_MINIMUM_ALIGNMENT, as it was intended. > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > --- > lib/alloc_phys.c | 7 +++---- > lib/alloc_phys.h | 2 -- > 2 files changed, 3 insertions(+), 6 deletions(-) Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
diff --git a/lib/alloc_phys.c b/lib/alloc_phys.c index a4d2bf23c1bc..3a78d0acd718 100644 --- a/lib/alloc_phys.c +++ b/lib/alloc_phys.c @@ -13,8 +13,6 @@ #define PHYS_ALLOC_NR_REGIONS 256 -#define DEFAULT_MINIMUM_ALIGNMENT 32 - struct phys_alloc_region { phys_addr_t base; phys_addr_t size; @@ -26,12 +24,13 @@ static int nr_regions; static struct spinlock lock; static phys_addr_t base, top; +#define DEFAULT_MINIMUM_ALIGNMENT 32 +static size_t align_min = DEFAULT_MINIMUM_ALIGNMENT; + static void *early_memalign(size_t alignment, size_t size); static struct alloc_ops early_alloc_ops = { .memalign = early_memalign, }; -static size_t align_min; - struct alloc_ops *alloc_ops = &early_alloc_ops; void phys_alloc_show(void) diff --git a/lib/alloc_phys.h b/lib/alloc_phys.h index 611aa70d2041..8049c340818d 100644 --- a/lib/alloc_phys.h +++ b/lib/alloc_phys.h @@ -15,8 +15,6 @@ */ #include "libcflat.h" -#define DEFAULT_MINIMUM_ALIGNMENT 32 - /* * phys_alloc_init creates the initial free memory region of size @size * at @base. The minimum alignment is set to DEFAULT_MINIMUM_ALIGNMENT.
Commit 11c4715fbf87 ("alloc: implement free") changed align_min from a static variable to a field for the alloc_ops struct and carried over the initializer value of DEFAULT_MINIMUM_ALIGNMENT. Commit 7e3e823b78c0 ("lib/alloc.h: remove align_min from struct alloc_ops") removed the align_min field and changed it back to a static variable, but missed initializing it. Initialize align_min to DEFAULT_MINIMUM_ALIGNMENT, as it was intended. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- lib/alloc_phys.c | 7 +++---- lib/alloc_phys.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-)