Skip to content

Commit 9bc4ffd

Browse files
maulik-k-shahrafaeljw
authored andcommitted
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: faf7ec4 ("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>
1 parent f431175 commit 9bc4ffd

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

kernel/power/suspend.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ static int __init mem_sleep_default_setup(char *str)
192192
if (mem_sleep_labels[state] &&
193193
!strcmp(str, mem_sleep_labels[state])) {
194194
mem_sleep_default = state;
195+
mem_sleep_current = state;
195196
break;
196197
}
197198

0 commit comments

Comments
 (0)