[PATCH v4] ARM: i.MX8M: smccc: allow SIP_BUILDINFO call on all imx8m variants

[Ahmad Fatoum]

Hello Johannes,

On 12.01.23 09:15, Johannes Schneider wrote:
> By adding a common config switch, the imx8m_init code becomes generic
> for all board variants (and slightly less confusing).
> 
> Signed-off-by: Johannes Schneider <johannes.schneider at leica-geosystems.com>
> 
> ---
> v4: add missing common switch
> 
> v3: redid patch with suggested common config switch

I am fine with either current_el() check or what you do here,
but given that you switched between them in revisions, I am
curious what the reasoning is.

Cheers,
Ahmad

> 
> v2: was:
> [PATCH v2 1/1] ARM: i.MX8M: smccc: fix firmware_atf check
> 
> v1: or'ed all IS_ENABLED(FIRMWARE_IMX8M[mnpq]_ATF
> ---
>  arch/arm/mach-imx/imx8m.c | 2 +-
>  firmware/Kconfig          | 7 +++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c
> index 9758525b54..4399dc7dd5 100644
> --- a/arch/arm/mach-imx/imx8m.c
> +++ b/arch/arm/mach-imx/imx8m.c
> @@ -61,7 +61,7 @@ static int imx8m_init(const char *cputypestr)
>  	pr_info("%s unique ID: %llx\n", cputypestr, imx8m_uid());
>  
>  	if (IS_ENABLED(CONFIG_ARM_SMCCC) &&
> -	    IS_ENABLED(CONFIG_FIRMWARE_IMX8MQ_ATF)) {
> +	    IS_ENABLED(CONFIG_FIRMWARE_IMX8M_ATF)) {
>  		arm_smccc_smc(IMX_SIP_BUILDINFO,
>  			      IMX_SIP_BUILDINFO_GET_COMMITHASH,
>  			      0, 0, 0, 0, 0, 0, &res);
> diff --git a/firmware/Kconfig b/firmware/Kconfig
> index b4a6fd9137..09ad85c539 100644
> --- a/firmware/Kconfig
> +++ b/firmware/Kconfig
> @@ -12,17 +12,24 @@ config FIRMWARE_IMX_LPDDR4_PMU_TRAIN
>  config FIRMWARE_IMX_DDR4_PMU_TRAIN
>         	bool
>  
> +config FIRMWARE_IMX8M_ATF
> +	bool
> +
>  config FIRMWARE_IMX8MM_ATF
>          bool
> +	select FIRMWARE_IMX8M_ATF

Your whitespacing are ok, but I see now that the file has
a mix of whitespace and tabs. I just sent out a patch for
this.

Cheers,
Ahmad

>  
>  config FIRMWARE_IMX8MN_ATF
>          bool
> +	select FIRMWARE_IMX8M_ATF
>  
>  config FIRMWARE_IMX8MP_ATF
>          bool
> +	select FIRMWARE_IMX8M_ATF
>  
>  config FIRMWARE_IMX8MQ_ATF
>          bool
> +	select FIRMWARE_IMX8M_ATF
>  
>  config FIRMWARE_CCBV2_OPTEE
>  	bool

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