From: Mark Rutland <mark.rutland@arm.com>
To: Sudeep Holla <sudeep.holla@arm.com>, arnd@arndb.de
Cc: linux-arm-kernel@lists.infradead.org,
Lorenzo Pieralisi <lpieralisi@kernel.org>
Subject: Re: [PATCH] firmware: psci: Fix return value from psci_system_suspend()
Date: Tue, 9 Jan 2024 09:48:56 +0000 [thread overview]
Message-ID: <ZZ0WiFsC4t_ZTZTu@FVFF77S0Q05N> (raw)
In-Reply-To: <20231113153446.82684-1-sudeep.holla@arm.com>
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@arm.com>
Sorry for the delay; this looks good to me:
Acked-by: Mark Rutland <mark.rutland@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@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-01-09 9:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 15:34 [PATCH] firmware: psci: Fix return value from psci_system_suspend() Sudeep Holla
2024-01-08 19:53 ` Sudeep Holla
2024-01-09 9:48 ` Mark Rutland [this message]
2024-06-17 10:12 ` Sudeep Holla
2024-06-17 10:40 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZZ0WiFsC4t_ZTZTu@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox