]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
PM: suspend: Set mem_sleep_current during kernel command line setup
authorMaulik Shah <quic_mkshah@quicinc.com>
Thu, 29 Feb 2024 06:44:59 +0000 (12:14 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:28:22 +0000 (15:28 +0200)
commit35c1cdd504a3957da80670606ec109fb1576f1bd
tree3a7b079909adc1cb828c9e0759d292c1b1abb42b
parented87a423756a206fb8a5fa0b2c12d1060fa3b2ff
PM: suspend: Set mem_sleep_current during kernel command line setup

[ Upstream commit 9bc4ffd32ef8943f5c5a42c9637cfd04771d021b ]

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@vger.kernel.org # 5.4+
Signed-off-by: Maulik Shah <quic_mkshah@quicinc.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/power/suspend.c