diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-04-10 11:55:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-11 12:24:00 +0200 |
| commit | db7eb206560c0d177a035b246437e87d08396a6f (patch) | |
| tree | 094625503be6e00eef6a3fe7bf11a504ccfe831c | |
| parent | 066a286679b4da9974e5f9a9ade84078966b1d55 (diff) | |
| download | linux-stable-db7eb206560c0d177a035b246437e87d08396a6f.tar.gz linux-stable-db7eb206560c0d177a035b246437e87d08396a6f.tar.bz2 linux-stable-db7eb206560c0d177a035b246437e87d08396a6f.zip | |
PM / core: Propagate dev->power.wakeup_path when no callbacks
[ Upstream commit dc351d4c5f4fe4d0f274d6d660227be0c3a03317 ]
The dev->power.direct_complete flag may become set in device_prepare() in
case the device don't have any PM callbacks (dev->power.no_pm_callbacks is
set). This leads to a broken behaviour, when there is child having wakeup
enabled and relies on its parent to be used in the wakeup path.
More precisely, when the direct complete path becomes selected for the
child in __device_suspend(), the propagation of the dev->power.wakeup_path
becomes skipped as well.
Let's address this problem, by checking if the device is a part the wakeup
path or has wakeup enabled, then prevent the direct complete path from
being used.
Reported-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
[ rjw: Comment cleanup ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/base/power/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 05409141ec07..8efdb823826c 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1378,6 +1378,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) if (dev->power.syscore) goto Complete; + /* Avoid direct_complete to let wakeup_path propagate. */ + if (device_may_wakeup(dev) || dev->power.wakeup_path) + dev->power.direct_complete = false; + if (dev->power.direct_complete) { if (pm_runtime_status_suspended(dev)) { pm_runtime_disable(dev); |