Commit 9bc4ffd3 authored by Maulik Shah's avatar Maulik Shah Committed by Rafael J. Wysocki
Browse files

PM: suspend: Set mem_sleep_current during kernel command line setup 



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: faf7ec4a ("drivers: firmware: psci: add system suspend support")
CC: stable@vger.kernel.org # 5.4+
Signed-off-by: default avatarMaulik Shah <quic_mkshah@quicinc.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f4311756

kernel/power/suspend.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

		}