PM / sleep: Do not assume that "mem" is always present
Subsystems (2)
PATCH 1/1 PM / sleep: Do not assume that "mem" is always present
An implementation of suspend_ops is allowed to reject the PM_SUSPEND_MEM suspend type from its ->valid() callback, we should not assume that it is always present as this is not a correct reflection of what a firmware interface may support.
--- kernel/power/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/power/suspend.c +2 -2
@@ -171,8 +171,7 @@ static bool valid_state(suspend_state_t state)void __init pm_states_init (void ) { -/* "mem" and "freeze" are always present in /sys/power/state. */ - pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ]; +/* "freeze" is always present in /sys/power/state. */ pm_states[PM_SUSPEND_TO_IDLE ] = pm_labels[PM_SUSPEND_TO_IDLE ];/* * Suspend-to-idle should be supported even without any suspend_ops,
@@ -214,6 +213,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops) }if (valid_state (PM_SUSPEND_MEM )) { mem_sleep_states[PM_SUSPEND_MEM ] = mem_sleep_labels[PM_SUSPEND_MEM ]; + pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ];if (mem_sleep_default >=PM_SUSPEND_MEM ) mem_sleep_current =PM_SUSPEND_MEM ; }
Signature · 1 line
2.25.1
Quoted 27 lines · Florian Fainelli
An implementation of
suspend_opsis allowed to reject thePM_SUSPEND_MEMsuspend type from its ->valid() callback, we should not assume that it is always present as this is not a correct reflection of what a firmware interface may support.Fixes 406e79385f32 ("PM / sleep: System sleep state selection interface rework")Signed-off-by Florian Fainelli <[email protected]>--- kernel/power/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/power/suspend.c +1
-2@@ -171,8 +171,7 @@ static bool valid_state(suspend_state_t state)void __init pm_states_init (void ) { -/* "mem" and "freeze" are always present in /sys/power/state. */ - pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ]; +/* "freeze" is always present in /sys/power/state. */ pm_states[PM_SUSPEND_TO_IDLE ] = pm_labels[PM_SUSPEND_TO_IDLE ];/* * Suspend-to-idle should be supported even without any suspend_ops,
kernel/power/suspend.c void suspend_set_ops(const struct platform_suspend_ops *ops)
Quoted 8 lines
kernel/power/suspend.c +1
-1@@ -214,6 +213,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops) }if (valid_state (PM_SUSPEND_MEM )) { mem_sleep_states[PM_SUSPEND_MEM ] = mem_sleep_labels[PM_SUSPEND_MEM ]; + pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ];if (mem_sleep_default >=PM_SUSPEND_MEM ) mem_sleep_current =PM_SUSPEND_MEM ; } --
Applied as 5.16 material, thanks!
Rafael J. Wysocki
maintainerQuoted 31 lines · Rafael J. Wysocki
Quoted 29 lines · Florian Fainelli
An implementation of
suspend_opsis allowed to reject thePM_SUSPEND_MEMsuspend type from its ->valid() callback, we should not assume that it is always present as this is not a correct reflection of what a firmware interface may support.Fixes 406e79385f32 ("PM / sleep: System sleep state selection interface rework")Signed-off-by Florian Fainelli <[email protected]>--- kernel/power/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/power/suspend.c +1
-2@@ -171,8 +171,7 @@ static bool valid_state(suspend_state_t state)void __init pm_states_init (void ) { -/* "mem" and "freeze" are always present in /sys/power/state. */ - pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ]; +/* "freeze" is always present in /sys/power/state. */ pm_states[PM_SUSPEND_TO_IDLE ] = pm_labels[PM_SUSPEND_TO_IDLE ];/* * Suspend-to-idle should be supported even without any suspend_ops, @@ -214,6 +213,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops) }if (valid_state (PM_SUSPEND_MEM )) {
Quoted 8 lines
kernel/power/suspend.c void suspend_set_ops(const struct platform_suspend_ops *ops)
Quoted 6 lines
kernel/power/suspend.c +1
-1mem_sleep_states[PM_SUSPEND_MEM ] = mem_sleep_labels[PM_SUSPEND_MEM ]; + pm_states[PM_SUSPEND_MEM ] = pm_labels[PM_SUSPEND_MEM ];if (mem_sleep_default >=PM_SUSPEND_MEM ) mem_sleep_current =PM_SUSPEND_MEM ; } --Applied as 5.16 material, thanks!
And reverted as per
https://lore.kernel.org/linux-pm/[email protected]/