Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c62ec461 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / core: Fix direct_complete handling for devices with no callbacks 

Commit 08810a41 (PM / core: Add NEVER_SKIP and SMART_PREPARE
driver flags) inadvertently prevented the power.direct_complete flag
from being set for devices without PM callbacks and with disabled
runtime PM which also prevents power.direct_complete from being set
for their parents.  That led to problems including a resume crash on
HP ZBook 14u.

Restore the previous behavior by causing power.direct_complete to be
set for those devices again, but do that in a more direct way to
avoid overlooking that case in the future.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=199693


Fixes: 08810a41 (PM / core: Add NEVER_SKIP and SMART_PREPARE driver flags)
Reported-by: default avatarThomas Martitz <kugel@rockbox.org>
Tested-by: default avatarThomas Martitz <kugel@rockbox.org>
Cc: 4.15+ <stable@vger.kernel.org> # 4.15+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
parent 771c577c

drivers/base/power/main.c

+3 −4
Original line number Diff line number Diff line
@@ -1923,10 +1923,8 @@ static int device_prepare(struct device *dev, pm_message_t state) 


	dev->power.wakeup_path = false;



	if (dev->power.no_pm_callbacks) {

		ret = 1;	/* Let device go direct_complete */

	if (dev->power.no_pm_callbacks)

		goto unlock;

	}



	if (dev->pm_domain)

		callback = dev->pm_domain->ops.prepare;
@@ -1960,7 +1958,8 @@ static int device_prepare(struct device *dev, pm_message_t state) 
	 */

	spin_lock_irq(&dev->power.lock);

	dev->power.direct_complete = state.event == PM_EVENT_SUSPEND &&

		pm_runtime_suspended(dev) && ret > 0 &&

		((pm_runtime_suspended(dev) && ret > 0) ||

		 dev->power.no_pm_callbacks) &&

		!dev_pm_test_driver_flags(dev, DPM_FLAG_NEVER_SKIP);

	spin_unlock_irq(&dev->power.lock);

	return 0;