[kvm-unit-tests PATCH v1 03/18] lib/alloc_phys: Initialize align_min

Shaoqin Huang
2023-11-30T09:08:00Z

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. Change it back to being initialized with the value
DEFAULT_MINIMUM_ALIGNMENT.

Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
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(-)

diff --git a/lib/alloc_phys.c b/lib/alloc_phys.c
index a4d2bf23..3a78d0ac 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 611aa70d..8049c340 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.
--
2.40.1