From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alan Stern <stern@rowland.harvard.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Mark Brown <broonie@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Lukas Wunner <lukas@wunner.de>, Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [PATCH v5 3/5] PM / sleep: Make async suspend/resume of devices use device links
Date: Mon, 10 Oct 2016 14:54:32 +0200 [thread overview]
Message-ID: <2538022.qMGl8lB1tE@vostro.rjw.lan> (raw)
In-Reply-To: <13957403.ZrB4mMbICz@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Make the device suspend/resume part of the core system
suspend/resume code use device links to ensure that supplier
and consumer devices will be suspended and resumed in the right
order in case of async suspend/resume.
The idea, roughly, is to use dpm_wait() to wait for all consumers
before a supplier device suspend and to wait for all suppliers
before a consumer device resume.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v4 -> v5:
- Rebase, change the symbol names in accordance with patch [2/5] etc.
- Use READ_ONCE() to annotate "unprotected" accesses to link status data.
---
drivers/base/power/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 79 insertions(+), 6 deletions(-)
Index: linux-pm/drivers/base/power/main.c
===================================================================
--- linux-pm.orig/drivers/base/power/main.c
+++ linux-pm/drivers/base/power/main.c
@@ -246,6 +246,62 @@ static void dpm_wait_for_children(struct
device_for_each_child(dev, &async, dpm_wait_fn);
}
+static void dpm_wait_for_suppliers(struct device *dev, bool async)
+{
+ struct device_link *link;
+ int idx;
+
+ idx = device_links_read_lock();
+
+ /*
+ * If the supplier goes away right after we've checked the link to it,
+ * we'll wait for its completion to change the state, but that's fine,
+ * because the only things that will block as a result are the SRCU
+ * callbacks freeing the link objects for the links in the list we're
+ * walking.
+ */
+ list_for_each_entry_rcu(link, &dev->links.suppliers, c_node)
+ if (READ_ONCE(link->status) != DL_STATE_DORMANT)
+ dpm_wait(link->supplier, async);
+
+ device_links_read_unlock(idx);
+}
+
+static void dpm_wait_for_superior(struct device *dev, bool async)
+{
+ dpm_wait(dev->parent, async);
+ dpm_wait_for_suppliers(dev, async);
+}
+
+static void dpm_wait_for_consumers(struct device *dev, bool async)
+{
+ struct device_link *link;
+ int idx;
+
+ idx = device_links_read_lock();
+
+ /*
+ * The status of a device link can only be changed from "dormant" by a
+ * probe, but that cannot happen during system suspend/resume. In
+ * theory it can change to "dormant" at that time, but then it is
+ * reasonable to wait for the target device anyway (eg. if it goes
+ * away, it's better to wait for it to go away completely and then
+ * continue instead of trying to continue in parallel with its
+ * unregistration).
+ */
+ list_for_each_entry_rcu(link, &dev->links.consumers, s_node)
+ if (READ_ONCE(link->status) != DL_STATE_DORMANT)
+ dpm_wait(link->consumer, async);
+
+ device_links_read_unlock(idx);
+}
+
+static void dpm_wait_for_subordinate(struct device *dev, bool async)
+{
+ dpm_wait_for_children(dev, async);
+ dpm_wait_for_consumers(dev, async);
+}
+
/**
* pm_op - Return the PM operation appropriate for given PM event.
* @ops: PM operations to choose from.
@@ -490,7 +546,7 @@ static int device_resume_noirq(struct de
if (!dev->power.is_noirq_suspended)
goto Out;
- dpm_wait(dev->parent, async);
+ dpm_wait_for_superior(dev, async);
if (dev->pm_domain) {
info = "noirq power domain ";
@@ -620,7 +676,7 @@ static int device_resume_early(struct de
if (!dev->power.is_late_suspended)
goto Out;
- dpm_wait(dev->parent, async);
+ dpm_wait_for_superior(dev, async);
if (dev->pm_domain) {
info = "early power domain ";
@@ -752,7 +808,7 @@ static int device_resume(struct device *
goto Complete;
}
- dpm_wait(dev->parent, async);
+ dpm_wait_for_superior(dev, async);
dpm_watchdog_set(&wd, dev);
device_lock(dev);
@@ -1040,7 +1096,7 @@ static int __device_suspend_noirq(struct
if (dev->power.syscore || dev->power.direct_complete)
goto Complete;
- dpm_wait_for_children(dev, async);
+ dpm_wait_for_subordinate(dev, async);
if (dev->pm_domain) {
info = "noirq power domain ";
@@ -1187,7 +1243,7 @@ static int __device_suspend_late(struct
if (dev->power.syscore || dev->power.direct_complete)
goto Complete;
- dpm_wait_for_children(dev, async);
+ dpm_wait_for_subordinate(dev, async);
if (dev->pm_domain) {
info = "late power domain ";
@@ -1344,6 +1400,22 @@ static int legacy_suspend(struct device
return error;
}
+static void dpm_clear_suppliers_direct_complete(struct device *dev)
+{
+ struct device_link *link;
+ int idx;
+
+ idx = device_links_read_lock();
+
+ list_for_each_entry_rcu(link, &dev->links.suppliers, c_node) {
+ spin_lock_irq(&link->supplier->power.lock);
+ link->supplier->power.direct_complete = false;
+ spin_unlock_irq(&link->supplier->power.lock);
+ }
+
+ device_links_read_unlock(idx);
+}
+
/**
* device_suspend - Execute "suspend" callbacks for given device.
* @dev: Device to handle.
@@ -1360,7 +1432,7 @@ static int __device_suspend(struct devic
TRACE_DEVICE(dev);
TRACE_SUSPEND(0);
- dpm_wait_for_children(dev, async);
+ dpm_wait_for_subordinate(dev, async);
if (async_error)
goto Complete;
@@ -1456,6 +1528,7 @@ static int __device_suspend(struct devic
spin_unlock_irq(&parent->power.lock);
}
+ dpm_clear_suppliers_direct_complete(dev);
}
device_unlock(dev);
next prev parent reply other threads:[~2016-10-10 12:59 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 21:25 [RFC/RFT][PATCH v2 0/7] Functional dependencies between devices Rafael J. Wysocki
2016-09-08 21:26 ` [RFC/RFT][PATCH v2 1/7] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-08 21:27 ` [RFC/RFT][PATCH v2 2/7] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-09-09 8:25 ` Ulf Hansson
2016-09-09 12:06 ` Mark Brown
2016-09-09 14:13 ` Ulf Hansson
2016-09-15 1:11 ` Rafael J. Wysocki
2016-09-11 13:40 ` Lukas Wunner
2016-09-11 20:43 ` Lukas Wunner
2016-09-14 1:21 ` Rafael J. Wysocki
2016-09-14 8:28 ` Lukas Wunner
2016-09-14 13:17 ` Rafael J. Wysocki
2016-09-08 21:28 ` [RFC/RFT][PATCH v2 3/7] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-10 13:31 ` Lukas Wunner
2016-09-10 22:12 ` Rafael J. Wysocki
2016-09-08 21:29 ` [RFC/RFT][PATCH v2 4/7] PM / runtime: Pass flags argument to __pm_runtime_disable() Rafael J. Wysocki
2016-09-08 21:29 ` [RFC/RFT][PATCH v2 5/7] PM / runtime: Flag to indicate PM sleep transitions in progress Rafael J. Wysocki
2016-09-12 14:07 ` Lukas Wunner
2016-09-12 21:25 ` Rafael J. Wysocki
2016-09-12 22:52 ` Lukas Wunner
2016-09-13 7:21 ` Marek Szyprowski
2016-09-13 23:59 ` Rafael J. Wysocki
2016-09-08 21:30 ` [RFC/RFT][PATCH v2 6/7] PM / runtime: Use device links Rafael J. Wysocki
2016-09-12 9:47 ` Lukas Wunner
2016-09-12 13:57 ` Rafael J. Wysocki
2016-09-14 1:19 ` Rafael J. Wysocki
2016-09-08 21:31 ` [RFC/RFT][PATCH v2 7/7] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-08 21:35 ` [RFC/RFT][PATCH v2 0/7] Functional dependencies between devices Rafael J. Wysocki
2016-09-10 11:39 ` Lukas Wunner
2016-09-10 22:04 ` Rafael J. Wysocki
2016-09-13 17:57 ` Lukas Wunner
2016-09-13 23:18 ` Rafael J. Wysocki
2016-09-18 12:39 ` Lukas Wunner
[not found] ` <CGME20160913095858eucas1p267ec2397c9e4577f94557e4a38498164@eucas1p2.samsung.com>
2016-09-13 9:58 ` Marek Szyprowski
2016-09-13 22:41 ` Rafael J. Wysocki
2016-09-18 11:23 ` Lukas Wunner
2016-09-15 22:03 ` [RFC/RFT][PATCH v3 0/5] " Rafael J. Wysocki
2016-09-15 22:04 ` [Resend][RFC/RFT][PATCH v3 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-15 22:06 ` [RFC/RFT][PATCH v3 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-09-16 7:53 ` Marek Szyprowski
2016-09-16 12:06 ` Rafael J. Wysocki
2016-09-16 12:33 ` [Update][RFC/RFT][PATCH " Rafael J. Wysocki
2016-09-19 22:46 ` Lukas Wunner
2016-09-23 13:03 ` Lukas Wunner
2016-09-23 13:42 ` Rafael J. Wysocki
2016-09-26 16:51 ` Lukas Wunner
2016-09-27 12:16 ` Rafael J. Wysocki
2016-09-27 8:54 ` Lukas Wunner
2016-09-27 11:52 ` Rafael J. Wysocki
2016-09-28 10:43 ` Lukas Wunner
2016-09-28 11:31 ` Rafael J. Wysocki
2016-09-29 10:36 ` Lukas Wunner
2016-09-15 22:06 ` [RFC/RFT][PATCH v3 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-15 22:07 ` [RFC/RFT][PATCH v3 4/5] PM / runtime: Use " Rafael J. Wysocki
2016-09-15 22:07 ` [RFC/RFT][PATCH v3 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-16 7:25 ` [RFC/RFT][PATCH v3 0/5] Functional dependencies between devices Marek Szyprowski
2016-09-16 7:57 ` Marek Szyprowski
2016-09-16 12:04 ` Rafael J. Wysocki
2016-09-27 12:34 ` Lukas Wunner
2016-09-28 0:33 ` Rafael J. Wysocki
2016-09-28 11:42 ` Lukas Wunner
2016-09-29 0:51 ` Rafael J. Wysocki
2016-11-15 18:50 ` Lukas Wunner
2016-09-29 0:24 ` [PATCH v4 " Rafael J. Wysocki
2016-09-29 0:25 ` [Resend][PATCH v4 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-29 0:38 ` [PATCH v4 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-01 7:43 ` Lukas Wunner
2016-10-01 23:32 ` Rafael J. Wysocki
2016-09-29 0:38 ` [Resend][PATCH v4 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-29 0:40 ` [PATCH v4 4/5] PM / runtime: Use " Rafael J. Wysocki
2016-09-29 0:41 ` [Rebase][PATCH v4 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-29 6:58 ` [PATCH v4 0/5] Functional dependencies between devices Marek Szyprowski
2016-09-29 12:27 ` Rafael J. Wysocki
2016-10-02 23:13 ` Lukas Wunner
2016-10-10 12:36 ` [PATCH v5 " Rafael J. Wysocki
2016-10-10 12:37 ` [Resend][PATCH v5 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-10-10 12:51 ` [PATCH v5 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-26 11:19 ` Lukas Wunner
2016-10-27 15:25 ` Greg Kroah-Hartman
2016-10-28 9:57 ` Lukas Wunner
2016-11-07 21:22 ` Luis R. Rodriguez
2016-11-08 6:45 ` Greg Kroah-Hartman
2016-11-08 19:21 ` Luis R. Rodriguez
2016-11-08 19:43 ` Greg Kroah-Hartman
2016-11-08 20:58 ` Luis R. Rodriguez
2016-11-09 6:45 ` Greg Kroah-Hartman
2016-11-09 9:36 ` Andrzej Hajda
2016-11-09 9:41 ` Greg Kroah-Hartman
2016-11-13 16:58 ` Lukas Wunner
2016-11-10 0:43 ` Rafael J. Wysocki
2016-11-10 0:59 ` Luis R. Rodriguez
2016-11-10 7:14 ` Laurent Pinchart
2016-11-10 22:04 ` Luis R. Rodriguez
2016-11-10 22:40 ` Greg Kroah-Hartman
2016-11-11 0:08 ` Laurent Pinchart
2016-11-13 10:59 ` Greg Kroah-Hartman
2016-11-14 14:50 ` Luis R. Rodriguez
2016-11-14 8:15 ` Geert Uytterhoeven
2016-11-10 8:46 ` Geert Uytterhoeven
2016-11-10 22:12 ` Luis R. Rodriguez
2016-10-27 15:32 ` Greg Kroah-Hartman
2016-11-07 21:39 ` Luis R. Rodriguez
2016-11-10 1:07 ` Rafael J. Wysocki
2016-11-10 7:05 ` Laurent Pinchart
2016-11-10 23:09 ` Luis R. Rodriguez
2016-11-13 17:34 ` Lukas Wunner
2016-11-14 13:48 ` Luis R. Rodriguez
2016-11-14 15:48 ` Lukas Wunner
2016-11-14 16:00 ` Luis R. Rodriguez
2016-10-10 12:54 ` Rafael J. Wysocki [this message]
2016-10-10 12:56 ` [PATCH v5 4/5] PM / runtime: Use device links Rafael J. Wysocki
2016-10-20 13:17 ` [Update][PATCH " Rafael J. Wysocki
2016-10-10 12:57 ` [Rebase][PATCH v5 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-10-18 10:46 ` [PATCH v5 0/5] Functional dependencies between devices Marek Szyprowski
2016-10-19 11:57 ` Rafael J. Wysocki
2016-10-20 10:21 ` Marek Szyprowski
2016-10-20 12:54 ` Rafael J. Wysocki
2016-10-27 15:32 ` Greg Kroah-Hartman
[not found] ` <5811F0CF.5000204@huawei.com>
2016-10-28 9:39 ` Lukas Wunner
2016-11-02 20:55 ` Hanjun Guo
2016-10-30 16:22 ` [PATCH v6 " Rafael J. Wysocki
2016-10-30 16:28 ` [Resend][PATCH v6 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-10-30 16:29 ` [Resend][PATCH v6 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-10-30 16:32 ` [PATCH v6 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-30 16:32 ` [PATCH v6 4/5] PM / runtime: Use device links Rafael J. Wysocki
2016-12-18 14:01 ` Lukas Wunner
2016-12-18 15:53 ` Rafael J. Wysocki
2016-12-18 16:37 ` Lukas Wunner
2016-12-19 12:38 ` Rafael J. Wysocki
2016-10-30 16:32 ` [Resend][PATCH v6 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-10-30 16:40 ` [PATCH v6 0/5] Functional dependencies between devices Rafael J. Wysocki
2016-10-31 17:47 ` Greg Kroah-Hartman
2016-11-01 3:50 ` Rafael J. Wysocki
2016-11-02 7:58 ` Marek Szyprowski
2016-11-05 12:10 ` Greg Kroah-Hartman
2016-11-07 21:15 ` Luis R. Rodriguez
2016-11-08 6:36 ` Marek Szyprowski
2016-11-08 20:14 ` Luis R. Rodriguez
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=2538022.qMGl8lB1tE@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=m.szyprowski@samsung.com \
--cc=mcgrof@suse.com \
--cc=stern@rowland.harvard.edu \
--cc=tomeu.vizoso@collabora.com \
--cc=ulf.hansson@linaro.org \
/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).