Re: [PATCH v2 01/34] ARM: remove unused membase argument

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

On 17.05.23 11:03, Sascha Hauer wrote:
> The functions determining the different memory locations for stack,
> early malloc, ttb and op-tee all take a membase argument which is
> unused as all locations depend on the end of memory. Remove this unused
> argument.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

> ---
>  arch/arm/boards/raspberry-pi/lowlevel.c |  2 +-
>  arch/arm/cpu/entry.c                    |  2 +-
>  arch/arm/cpu/start.c                    |  6 ++---
>  arch/arm/cpu/uncompress.c               |  6 ++---
>  arch/arm/include/asm/barebox-arm.h      | 29 ++++++++++---------------
>  5 files changed, 20 insertions(+), 25 deletions(-)
> 
> diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c
> index 742f177dec..fd11fe53e0 100644
> --- a/arch/arm/boards/raspberry-pi/lowlevel.c
> +++ b/arch/arm/boards/raspberry-pi/lowlevel.c
> @@ -42,7 +42,7 @@ static void copy_vc_fdt(void *dest, void *src, unsigned long max_size)
>   * this FDT there. We fetch it from there later in rpi_devices_init().
>   */
>  #define rpi_stack_top(memsize) \
> -	arm_mem_stack_top(BCM2835_SDRAM_BASE, BCM2835_SDRAM_BASE + memsize - VIDEOCORE_FDT_SZ)
> +	arm_mem_stack_top(BCM2835_SDRAM_BASE + memsize - VIDEOCORE_FDT_SZ)
>  
>  static inline void start_raspberry_pi(unsigned long memsize, void *fdt,
>  								void *vc_fdt)
> diff --git a/arch/arm/cpu/entry.c b/arch/arm/cpu/entry.c
> index b863af5757..dc264c8771 100644
> --- a/arch/arm/cpu/entry.c
> +++ b/arch/arm/cpu/entry.c
> @@ -40,5 +40,5 @@ void NAKED __noreturn barebox_arm_entry(unsigned long membase,
>  					unsigned long memsize, void *boarddata)
>  {
>  	__barebox_arm_entry(membase, memsize, boarddata,
> -			    arm_mem_stack_top(membase, membase + memsize));
> +			    arm_mem_stack_top(membase + memsize));
>  }
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index be303514c2..62b2054dd6 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -111,7 +111,7 @@ static inline unsigned long arm_mem_boarddata(unsigned long membase,
>  
>  unsigned long arm_mem_ramoops_get(void)
>  {
> -	return arm_mem_ramoops(0, arm_stack_top);
> +	return arm_mem_ramoops(arm_stack_top);
>  }
>  EXPORT_SYMBOL_GPL(arm_mem_ramoops_get);
>  
> @@ -163,12 +163,12 @@ __noreturn __no_sanitize_address void barebox_non_pbl_start(unsigned long membas
>  
>  	arm_membase = membase;
>  	arm_endmem = endmem;
> -	arm_stack_top = arm_mem_stack_top(membase, endmem);
> +	arm_stack_top = arm_mem_stack_top(endmem);
>  	arm_barebox_size = barebox_size;
>  	malloc_end = barebox_base;
>  
>  	if (IS_ENABLED(CONFIG_MMU_EARLY)) {
> -		unsigned long ttb = arm_mem_ttb(membase, endmem);
> +		unsigned long ttb = arm_mem_ttb(endmem);
>  
>  		if (IS_ENABLED(CONFIG_PBL_IMAGE)) {
>  			arm_set_cache_functions();
> diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c
> index 65de87f109..abaf36b68c 100644
> --- a/arch/arm/cpu/uncompress.c
> +++ b/arch/arm/cpu/uncompress.c
> @@ -82,13 +82,13 @@ void __noreturn barebox_pbl_start(unsigned long membase, unsigned long memsize,
>  	pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize);
>  
>  	if (IS_ENABLED(CONFIG_MMU_EARLY)) {
> -		unsigned long ttb = arm_mem_ttb(membase, endmem);
> +		unsigned long ttb = arm_mem_ttb(endmem);
>  		pr_debug("enabling MMU, ttb @ 0x%08lx\n", ttb);
>  		mmu_early_enable(membase, memsize - OPTEE_SIZE, ttb);
>  	}
>  
> -	free_mem_ptr = arm_mem_early_malloc(membase, endmem);
> -	free_mem_end_ptr = arm_mem_early_malloc_end(membase, endmem);
> +	free_mem_ptr = arm_mem_early_malloc(endmem);
> +	free_mem_end_ptr = arm_mem_early_malloc_end(endmem);
>  
>  	pr_debug("uncompressing barebox binary at 0x%p (size 0x%08x) to 0x%08lx (uncompressed size: 0x%08x)\n",
>  			pg_start, pg_len, barebox_base, uncompressed_len);
> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
> index 0cf4549cd7..2e0d8dc9a7 100644
> --- a/arch/arm/include/asm/barebox-arm.h
> +++ b/arch/arm/include/asm/barebox-arm.h
> @@ -78,39 +78,34 @@ static inline const void *arm_mem_scratch_get(void)
>  	return (const void *)__arm_mem_scratch(arm_mem_endmem_get());
>  }
>  
> -#define arm_mem_stack_top(membase, endmem) ((endmem) - SZ_64K - OPTEE_SIZE)
> +#define arm_mem_stack_top(endmem) ((endmem) - SZ_64K - OPTEE_SIZE)
>  
> -static inline unsigned long arm_mem_stack(unsigned long membase,
> -					  unsigned long endmem)
> +static inline unsigned long arm_mem_stack(unsigned long endmem)
>  {
> -	return arm_mem_stack_top(membase, endmem) - STACK_SIZE;
> +	return arm_mem_stack_top(endmem) - STACK_SIZE;
>  }
>  
> -static inline unsigned long arm_mem_ttb(unsigned long membase,
> -					unsigned long endmem)
> +static inline unsigned long arm_mem_ttb(unsigned long endmem)
>  {
> -	endmem = arm_mem_stack(membase, endmem);
> +	endmem = arm_mem_stack(endmem);
>  	endmem = ALIGN_DOWN(endmem, ARM_TTB_SIZE) - ARM_TTB_SIZE;
>  
>  	return endmem;
>  }
>  
> -static inline unsigned long arm_mem_early_malloc(unsigned long membase,
> -						 unsigned long endmem)
> +static inline unsigned long arm_mem_early_malloc(unsigned long endmem)
>  {
> -	return arm_mem_ttb(membase, endmem) - SZ_128K;
> +	return arm_mem_ttb(endmem) - SZ_128K;
>  }
>  
> -static inline unsigned long arm_mem_early_malloc_end(unsigned long membase,
> -						     unsigned long endmem)
> +static inline unsigned long arm_mem_early_malloc_end(unsigned long endmem)
>  {
> -	return arm_mem_ttb(membase, endmem);
> +	return arm_mem_ttb(endmem);
>  }
>  
> -static inline unsigned long arm_mem_ramoops(unsigned long membase,
> -					    unsigned long endmem)
> +static inline unsigned long arm_mem_ramoops(unsigned long endmem)
>  {
> -	endmem = arm_mem_ttb(membase, endmem);
> +	endmem = arm_mem_ttb(endmem);
>  #ifdef CONFIG_FS_PSTORE_RAMOOPS
>  	endmem -= CONFIG_FS_PSTORE_RAMOOPS_SIZE;
>  	endmem = ALIGN_DOWN(endmem, SZ_4K);
> @@ -123,7 +118,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase,
>  						  unsigned long endmem,
>  						  unsigned long size)
>  {
> -	endmem = arm_mem_ramoops(membase, endmem);
> +	endmem = arm_mem_ramoops(endmem);
>  
>  	if (IS_ENABLED(CONFIG_RELOCATABLE)) {
>  		return ALIGN_DOWN(endmem - size, SZ_1M);

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |