From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
"open list:SUSPEND TO RAM" <linux-pm@vger.kernel.org>
Subject: Re: [PATCH] PM / sleep: Do not assume that "mem" is always present
Date: Wed, 15 Sep 2021 14:05:20 +0200 [thread overview]
Message-ID: <CAJZ5v0hEjQn-yr29RdpfYcsfqMCv_BK8obZy7kFP1q0SeM0Zxg@mail.gmail.com> (raw)
In-Reply-To: <20210915022328.56702-1-f.fainelli@gmail.com>
On Wed, Sep 15, 2021 at 4:23 AM Florian Fainelli <f.fainelli@gmail.com> wrote:
>
> 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.
>
> Fixes: 406e79385f32 ("PM / sleep: System sleep state selection interface rework")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> kernel/power/suspend.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index eb75f394a059..02e306ad8db8 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -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;
> }
> --
Applied as 5.16 material, thanks!
next prev parent reply other threads:[~2021-09-15 12:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 2:23 [PATCH] PM / sleep: Do not assume that "mem" is always present Florian Fainelli
2021-09-15 12:05 ` Rafael J. Wysocki [this message]
2021-10-20 13:54 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJZ5v0hEjQn-yr29RdpfYcsfqMCv_BK8obZy7kFP1q0SeM0Zxg@mail.gmail.com \
--to=rafael@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=geert+renesas@glider.be \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).