From: Ulf Hansson <ulf.hansson@linaro.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Alan Stern <stern@rowland.harvard.edu>,
Al Cooper <alcooperx@gmail.com>, Pavel Machek <pavel@ucw.cz>
Subject: Re: [PATCH] PM / core: Clear the direct_complete flag on errors
Date: Thu, 4 Oct 2018 15:22:29 +0200 [thread overview]
Message-ID: <CAPDyKFoUdQRUYQ0qb5WM=Bi-F_4Fe8VEPNYZGu2ezMPj_wxoPg@mail.gmail.com> (raw)
In-Reply-To: <61559514.Vym8FNvob2@aspire.rjw.lan>
On 4 October 2018 at 11:08, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> If __device_suspend() returns early on an error or pending wakeup
> and the power.direct_complete flag has been set for the device
> already, the subsequent device_resume() will be confused by it
> and it will call pm_runtime_enable() incorrectly, as runtime PM
> has not been disabled for the device by __device_suspend().
I think it would be fair to mention that is related to the async
suspend path, in dpm_suspend().
>
> To avoid that, clear power.direct_complete if __device_suspend()
> is not going to disable runtime PM for the device before returning.
Overall, by looking at the behavior in dpm_suspend() of async
suspended devices, it does look a bit fragile to me.
My worries is that we put asynced suspended devices in the
dpm_suspended_list, no matter if the device was successfully suspended
or not. This differs from the no-async path.
In the long run, maybe we should change that instead?
>
> Fixes: aae4518b3124 (PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily)
> Reported-by: Al Cooper <alcooperx@gmail.com>
> Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> drivers/base/power/main.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> Index: linux-pm/drivers/base/power/main.c
> ===================================================================
> --- linux-pm.orig/drivers/base/power/main.c
> +++ linux-pm/drivers/base/power/main.c
> @@ -1713,8 +1713,10 @@ static int __device_suspend(struct devic
>
> dpm_wait_for_subordinate(dev, async);
>
> - if (async_error)
> + if (async_error) {
> + dev->power.direct_complete = false;
> goto Complete;
> + }
>
> /*
> * If a device configured to wake up the system from sleep states
> @@ -1726,6 +1728,7 @@ static int __device_suspend(struct devic
> pm_wakeup_event(dev, 0);
>
> if (pm_wakeup_pending()) {
> + dev->power.direct_complete = false;
> async_error = -EBUSY;
> goto Complete;
> }
>
next prev parent reply other threads:[~2018-10-04 13:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 9:08 [PATCH] PM / core: Clear the direct_complete flag on errors Rafael J. Wysocki
2018-10-04 13:22 ` Ulf Hansson [this message]
2018-10-04 13:59 ` Alan Cooper
2018-10-04 14:40 ` Ulf Hansson
2018-10-04 17:47 ` Rafael J. Wysocki
2018-10-04 18:48 ` Ulf Hansson
2018-10-04 20:57 ` Rafael J. Wysocki
2018-10-04 21:26 ` Ulf Hansson
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='CAPDyKFoUdQRUYQ0qb5WM=Bi-F_4Fe8VEPNYZGu2ezMPj_wxoPg@mail.gmail.com' \
--to=ulf.hansson@linaro.org \
--cc=alcooperx@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=stern@rowland.harvard.edu \
/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).