[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJZ5v0g_Cb-zPDD6z_C_HEewvsZJA_4FRiOnmhzX=KsRAL8daA@mail.gmail.com>
Date: Thu, 29 Feb 2024 20:34:13 +0100
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Maulik Shah <quic_mkshah@...cinc.com>
Cc: Mark Rutland <mark.rutland@....com>, Lorenzo Pieralisi <lpieralisi@...nel.org>, andersson@...nel.org,
ulf.hansson@...aro.org, "Rafael J. Wysocki" <rafael@...nel.org>, Len Brown <len.brown@...el.com>,
Pavel Machek <pavel@....cz>, Sudeep Holla <Sudeep.Holla@....com>, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-pm@...r.kernel.org, quic_lsrao@...cinc.com, stable@...r.kernel.org
Subject: Re: [PATCH v2] PM: suspend: Set mem_sleep_current during kernel
command line setup
On Thu, Feb 29, 2024 at 7:45 AM Maulik Shah <quic_mkshah@...cinc.com> wrote:
>
> psci_init_system_suspend() invokes suspend_set_ops() very early during
> bootup even before kernel command line for mem_sleep_default is setup.
> This leads to kernel command line mem_sleep_default=s2idle not working
> as mem_sleep_current gets changed to deep via suspend_set_ops() and never
> changes back to s2idle.
>
> Set mem_sleep_current along with mem_sleep_default during kernel command
> line setup as default suspend mode.
>
> Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support")
> CC: stable@...r.kernel.org # 5.4+
> Signed-off-by: Maulik Shah <quic_mkshah@...cinc.com>
> ---
> Changes in v2:
> - Set mem_sleep_current during mem_sleep_default kernel command line setup
> - Update commit message accordingly
> - Retain Fixes: tag
> - Link to v1: https://lore.kernel.org/r/20240219-suspend_ops_late_init-v1-1-6330ca9597fa@quicinc.com
> ---
> kernel/power/suspend.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index 742eb26618cc..e3ae93bbcb9b 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -192,6 +192,7 @@ static int __init mem_sleep_default_setup(char *str)
> if (mem_sleep_labels[state] &&
> !strcmp(str, mem_sleep_labels[state])) {
> mem_sleep_default = state;
> + mem_sleep_current = state;
> break;
> }
>
>
> ---
Applied as 6.9 material, thanks!
Powered by blists - more mailing lists