mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
PM: suspend: Set mem_sleep_current during kernel command line setup
[ Upstream commit9bc4ffd32e
] 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:faf7ec4a92
("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>
This commit is contained in:
parent
42dcb0a374
commit
ddcd5ea7b2
1 changed files with 1 additions and 0 deletions
|
@ -187,6 +187,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue