[PATCH 1/3] firmware: psci: Fix bind_smccc_features psci check

[Heinrich Schuchardt]

On 25.01.24 15:05, Weizhao Ouyang wrote:
> According to PSCI specification DEN0022F, PSCI_FEATURES is used to check
> whether the SMCCC is implemented by discovering SMCCC_VERSION.
>
> Signed-off-by: Weizhao Ouyang <o451686892 at gmail.com>

5.15.2 Implementation responsibilities

PSCI_FEATURES should report the presence of SMCCC_VERSION in privileged
platform firmware compliant with PSCI v1.0 and later revisions.

Acked-by: Heinrich Schuchardt <xypron.glpk at gmx.de>

> ---
>   drivers/firmware/psci.c   | 2 +-
>   include/linux/arm-smccc.h | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index c6b9efab41..894be8128d 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -135,7 +135,7 @@ static int bind_smccc_features(struct udevice *dev, int psci_method)
>   	    PSCI_VERSION_MAJOR(psci_0_2_get_version()) == 0)
>   		return 0;
>
> -	if (request_psci_features(ARM_SMCCC_ARCH_FEATURES) ==
> +	if (request_psci_features(ARM_SMCCC_VERSION) ==
>   	    PSCI_RET_NOT_SUPPORTED)
>   		return 0;
>
> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> index f44e9e8f93..453017eb5f 100644
> --- a/include/linux/arm-smccc.h
> +++ b/include/linux/arm-smccc.h
> @@ -55,6 +55,7 @@
>   #define ARM_SMCCC_QUIRK_NONE		0
>   #define ARM_SMCCC_QUIRK_QCOM_A6		1 /* Save/restore register a6 */
>
> +#define ARM_SMCCC_VERSION		0x80000000
>   #define ARM_SMCCC_ARCH_FEATURES		0x80000001
>
>   #define ARM_SMCCC_RET_NOT_SUPPORTED	((unsigned long)-1)