Re: [PATCH 05/23] ARM: i.MX8M: cosmetic cleanup

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

On 11/10/25 9:34 PM, Marco Felsch wrote:
> Rename the local imx8m_atf_start_bl31() to imx8m_tfa_start_bl31() since
> the official naming is Trusted-Firmware A (TF-A) and not ARM Trusted
> Firmware which was the former name.
> 
> While on it rename the parameters to make it clear what firmware
> component is passed and align the function documentation with the
> reality.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>

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

I split out this patch in a series that I just sent.

Cheers,
Ahmad

> ---
>  arch/arm/mach-imx/atf.c | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c
> index 42ab9e9a23e433c50a1df1739d0163049174e6a6..dd861f1ad87c98c8baffa2986aeef40eacedc88c 100644
> --- a/arch/arm/mach-imx/atf.c
> +++ b/arch/arm/mach-imx/atf.c
> @@ -19,11 +19,11 @@
>  #include <mach/imx/xload.h>
>  
>  /**
> - * imx8m_atf_load_bl31 - Load ATF BL31 blob and transfer control to it
> + * imx8m_tfa_start_bl31 - Load TF-A BL31 blob and transfer control to it
>   *
> - * @fw:		Pointer to the BL31 blob
> - * @fw_size:	Size of the BL31 blob
> - * @atf_dest:	Place where the BL31 is copied to and executed
> + * @tfa:	Pointer to the BL31 blob
> + * @tfa_size:	Size of the BL31 blob
> + * @tfa_dest:	Place where the BL31 is copied to and executed
>   *
>   * This function:
>   *
> @@ -37,12 +37,12 @@
>   *     3. Transfers control to BL31
>   */
>  
> -static __noreturn void imx8m_atf_start_bl31(const void *fw, size_t fw_size, void *atf_dest)
> +static __noreturn void imx8m_tfa_start_bl31(const void *tfa_bin, size_t tfa_size, void *tfa_dest)
>  {
> -	void __noreturn (*bl31)(void) = atf_dest;
> +	void __noreturn (*bl31)(void) = tfa_dest;
>  	int ret;
>  
> -	BUG_ON(fw_size > MX8M_ATF_BL31_SIZE_LIMIT);
> +	BUG_ON(tfa_size > MX8M_ATF_BL31_SIZE_LIMIT);
>  
>  	if (IS_ENABLED(CONFIG_FSL_CAAM_RNG_PBL_INIT)) {
>  		ret = imx_early_caam_init(MX8M_CAAM_BASE_ADDR);
> @@ -52,10 +52,10 @@ static __noreturn void imx8m_atf_start_bl31(const void *fw, size_t fw_size, void
>  			pr_debug("CAAM early init successful\n");
>  	}
>  
> -	memcpy(bl31, fw, fw_size);
> +	memcpy(bl31, tfa_bin, tfa_size);
>  
>  	asm volatile("msr sp_el2, %0" : :
> -		     "r" (atf_dest - 16) :
> +		     "r" (tfa_dest - 16) :
>  		     "cc");
>  	bl31();
>  	__builtin_unreachable();
> @@ -176,7 +176,7 @@ __noreturn void __imx8mm_load_and_start_image_via_tfa(void *fdt, void *bl33)
>  		get_builtin_firmware(imx8mm_bl31_bin, &bl31, &bl31_size);
>  	}
>  
> -	imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MM_ATF_BL31_BASE_ADDR);
> +	imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MM_ATF_BL31_BASE_ADDR);
>  }
>  
>  void imx8mp_load_bl33(void *bl33)
> @@ -250,10 +250,9 @@ __noreturn void __imx8mp_load_and_start_image_via_tfa(void *fdt, void *bl33)
>  		get_builtin_firmware(imx8mp_bl31_bin, &bl31, &bl31_size);
>  	}
>  
> -	imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MP_ATF_BL31_BASE_ADDR);
> +	imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MP_ATF_BL31_BASE_ADDR);
>  }
>  
> -
>  void imx8mn_load_bl33(void *bl33)
>  {
>  	enum bootsource src;
> @@ -325,7 +324,7 @@ __noreturn void __imx8mn_load_and_start_image_via_tfa(void *fdt, void *bl33)
>  		get_builtin_firmware(imx8mn_bl31_bin, &bl31, &bl31_size);
>  	}
>  
> -	imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MN_ATF_BL31_BASE_ADDR);
> +	imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MN_ATF_BL31_BASE_ADDR);
>  }
>  
>  void imx8mq_load_bl33(void *bl33)
> @@ -393,7 +392,7 @@ __noreturn void __imx8mq_load_and_start_image_via_tfa(void *fdt, void *bl33)
>  		get_builtin_firmware(imx8mq_bl31_bin, &bl31, &bl31_size);
>  	}
>  
> -	imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR);
> +	imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR);
>  }
>  
>  void __noreturn imx93_load_and_start_image_via_tfa(void)
> 

-- 
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 |