diff mbox series

[kvm-unit-tests,v2,12/18] arm/arm64: Factor out allocator init from mem_init

Message ID 20240227192109.487402-32-andrew.jones@linux.dev (mailing list archive)
State New, archived
Headers show
Series arm64: EFI improvements | expand

Commit Message

Andrew Jones Feb. 27, 2024, 7:21 p.m. UTC 
The allocator init is identical for mem_init() and efi_mem_init().
Share it.

Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
 lib/arm/setup.c | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

Comments

Nikos Nikoleris March 4, 2024, 8:01 a.m. UTC | #1 
On 27/02/2024 19:21, Andrew Jones wrote:
> The allocator init is identical for mem_init() and efi_mem_init().
> Share it.
> 
> Signed-off-by: Andrew Jones <andrew.jones@linux.dev>

Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>

Thanks,

Nikos

> ---
>   lib/arm/setup.c | 46 ++++++++++++++++++++++------------------------
>   1 file changed, 22 insertions(+), 24 deletions(-)
> 
> diff --git a/lib/arm/setup.c b/lib/arm/setup.c
> index f96ee04ddd68..d0be4c437708 100644
> --- a/lib/arm/setup.c
> +++ b/lib/arm/setup.c
> @@ -136,9 +136,28 @@ static void arm_memregions_add_assumed(void)
>   #endif
>   }
>   
> -static void mem_init(phys_addr_t freemem_start)
> +static void mem_allocator_init(phys_addr_t freemem_start, phys_addr_t freemem_end)
>   {
>   	phys_addr_t base, top;
> +
> +	freemem_start = PAGE_ALIGN(freemem_start);
> +	freemem_end &= PAGE_MASK;
> +
> +	phys_alloc_init(freemem_start, freemem_end - freemem_start);
> +	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
> +
> +	phys_alloc_get_unused(&base, &top);
> +	base = PAGE_ALIGN(base);
> +	top &= PAGE_MASK;
> +	assert(sizeof(long) == 8 || !(base >> 32));
> +	if (sizeof(long) != 8 && (top >> 32) != 0)
> +		top = ((uint64_t)1 << 32);
> +	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
> +	page_alloc_ops_enable();
> +}
> +
> +static void mem_init(phys_addr_t freemem_start)
> +{
>   	struct mem_region *freemem, *r, mem = {
>   		.start = (phys_addr_t)-1,
>   	};
> @@ -169,17 +188,7 @@ static void mem_init(phys_addr_t freemem_start)
>   	__phys_offset = mem.start;	/* PHYS_OFFSET */
>   	__phys_end = mem.end;		/* PHYS_END */
>   
> -	phys_alloc_init(freemem_start, freemem->end - freemem_start);
> -	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
> -
> -	phys_alloc_get_unused(&base, &top);
> -	base = PAGE_ALIGN(base);
> -	top = top & PAGE_MASK;
> -	assert(sizeof(long) == 8 || !(base >> 32));
> -	if (sizeof(long) != 8 && (top >> 32) != 0)
> -		top = ((uint64_t)1 << 32);
> -	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
> -	page_alloc_ops_enable();
> +	mem_allocator_init(freemem_start, freemem->end);
>   }
>   
>   static void freemem_push_fdt(void **freemem, const void *fdt)
> @@ -292,7 +301,6 @@ static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo)
>   	struct efi_boot_memmap *map = &(efi_bootinfo->mem_map);
>   	efi_memory_desc_t *buffer = *map->map;
>   	efi_memory_desc_t *d = NULL;
> -	phys_addr_t base, top;
>   	struct mem_region r;
>   	uintptr_t text = (uintptr_t)&_text, etext = ALIGN((uintptr_t)&_etext, 4096);
>   	uintptr_t data = (uintptr_t)&_data, edata = ALIGN((uintptr_t)&_edata, 4096);
> @@ -380,17 +388,7 @@ static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo)
>   
>   	assert(sizeof(long) == 8 || free_mem_start < (3ul << 30));
>   
> -	phys_alloc_init(free_mem_start, free_mem_pages << EFI_PAGE_SHIFT);
> -	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
> -
> -	phys_alloc_get_unused(&base, &top);
> -	base = PAGE_ALIGN(base);
> -	top = top & PAGE_MASK;
> -	assert(sizeof(long) == 8 || !(base >> 32));
> -	if (sizeof(long) != 8 && (top >> 32) != 0)
> -		top = ((uint64_t)1 << 32);
> -	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
> -	page_alloc_ops_enable();
> +	mem_allocator_init(free_mem_start, free_mem_start + (free_mem_pages << EFI_PAGE_SHIFT));
>   
>   	return EFI_SUCCESS;
>   }
diff mbox series

Patch

diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index f96ee04ddd68..d0be4c437708 100644
--- a/lib/arm/setup.c
+++ b/lib/arm/setup.c
@@ -136,9 +136,28 @@  static void arm_memregions_add_assumed(void)
 #endif
 }
 
-static void mem_init(phys_addr_t freemem_start)
+static void mem_allocator_init(phys_addr_t freemem_start, phys_addr_t freemem_end)
 {
 	phys_addr_t base, top;
+
+	freemem_start = PAGE_ALIGN(freemem_start);
+	freemem_end &= PAGE_MASK;
+
+	phys_alloc_init(freemem_start, freemem_end - freemem_start);
+	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
+
+	phys_alloc_get_unused(&base, &top);
+	base = PAGE_ALIGN(base);
+	top &= PAGE_MASK;
+	assert(sizeof(long) == 8 || !(base >> 32));
+	if (sizeof(long) != 8 && (top >> 32) != 0)
+		top = ((uint64_t)1 << 32);
+	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
+	page_alloc_ops_enable();
+}
+
+static void mem_init(phys_addr_t freemem_start)
+{
 	struct mem_region *freemem, *r, mem = {
 		.start = (phys_addr_t)-1,
 	};
@@ -169,17 +188,7 @@  static void mem_init(phys_addr_t freemem_start)
 	__phys_offset = mem.start;	/* PHYS_OFFSET */
 	__phys_end = mem.end;		/* PHYS_END */
 
-	phys_alloc_init(freemem_start, freemem->end - freemem_start);
-	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
-
-	phys_alloc_get_unused(&base, &top);
-	base = PAGE_ALIGN(base);
-	top = top & PAGE_MASK;
-	assert(sizeof(long) == 8 || !(base >> 32));
-	if (sizeof(long) != 8 && (top >> 32) != 0)
-		top = ((uint64_t)1 << 32);
-	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
-	page_alloc_ops_enable();
+	mem_allocator_init(freemem_start, freemem->end);
 }
 
 static void freemem_push_fdt(void **freemem, const void *fdt)
@@ -292,7 +301,6 @@  static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo)
 	struct efi_boot_memmap *map = &(efi_bootinfo->mem_map);
 	efi_memory_desc_t *buffer = *map->map;
 	efi_memory_desc_t *d = NULL;
-	phys_addr_t base, top;
 	struct mem_region r;
 	uintptr_t text = (uintptr_t)&_text, etext = ALIGN((uintptr_t)&_etext, 4096);
 	uintptr_t data = (uintptr_t)&_data, edata = ALIGN((uintptr_t)&_edata, 4096);
@@ -380,17 +388,7 @@  static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo)
 
 	assert(sizeof(long) == 8 || free_mem_start < (3ul << 30));
 
-	phys_alloc_init(free_mem_start, free_mem_pages << EFI_PAGE_SHIFT);
-	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
-
-	phys_alloc_get_unused(&base, &top);
-	base = PAGE_ALIGN(base);
-	top = top & PAGE_MASK;
-	assert(sizeof(long) == 8 || !(base >> 32));
-	if (sizeof(long) != 8 && (top >> 32) != 0)
-		top = ((uint64_t)1 << 32);
-	page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT);
-	page_alloc_ops_enable();
+	mem_allocator_init(free_mem_start, free_mem_start + (free_mem_pages << EFI_PAGE_SHIFT));
 
 	return EFI_SUCCESS;
 }