[PATCH] firmware: psci: Fix return value from psci_system_suspend()

[Mark Rutland]

On Mon, Nov 13, 2023 at 03:34:46PM +0000, Sudeep Holla wrote:
> Currently we return the value from invoke_psci_fn() directly as return
> value from psci_system_suspend(). It is wrong to send the PSCI interface
> return value directly. psci_to_linux_errno() provide the mapping from
> PSCI return value to the one that can be returned to the callers within
> the kernel.
> 
> Use psci_to_linux_errno() to convert and return the correct value from
> psci_system_suspend().
> 
> Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support")
> Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>

Sorry for the delay; this looks good to me:

Acked-by: Mark Rutland <mark.rutland at arm.com>

Arnd, are you happy to pick this up for v6.8?

Mark.

> ---
>  drivers/firmware/psci/psci.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Hi,
> 
> For some reason, this has gone unnoticed for years. I bumped into this when
> I was trying to test suspend on FVP which claims to support but returns error
> when called. The error was getting not communicated properly(incorrect
> error code) before this patch.
> 
> Regards,
> Sudeep
> 
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index d9629ff87861..2328ca58bba6 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -497,10 +497,12 @@ int psci_cpu_suspend_enter(u32 state)
> 
>  static int psci_system_suspend(unsigned long unused)
>  {
> +	int err;
>  	phys_addr_t pa_cpu_resume = __pa_symbol(cpu_resume);
> 
> -	return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
> +	err = invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
>  			      pa_cpu_resume, 0, 0);
> +	return psci_to_linux_errno(err);
>  }
> 
>  static int psci_system_suspend_enter(suspend_state_t state)
> --
> 2.42.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>