Skip to content

Commit d0b8651

Browse files
computersforpeacerafaeljw
authored andcommitted
PM: runtime: Make put{,_sync}() return 1 when already suspended
The pm_runtime.h docs say pm_runtime_put() and pm_runtime_put_sync() return 1 when already suspended, but this is not true -- they return -EAGAIN. On the other hand, pm_runtime_put_sync_suspend() and pm_runtime_put_sync_autosuspend() *do* return 1. This is an artifact of the fact that the former are built on rpm_idle(), whereas the latter are built on rpm_suspend(). There are precious few pm_runtime_put()/pm_runtime_put_sync() callers that check the return code at all, but most of them only log errors, and usually only for negative error codes. None of them should be treating this as an error, so: * at best, this may fix some case where a driver treats this condition as an error, when it shouldn't; * at worst, this should make no effect; and * somewhere in between, we could potentially clear up non-fatal log messages. Fix the pm_runtime_already_suspended_test() while tweaking the behavior. The test makes a lot more sense when these all return 1 when the device is already suspended: pm_runtime_put_sync(dev); pm_runtime_suspend(dev); pm_runtime_autosuspend(dev); pm_request_autosuspend(dev); pm_runtime_put_sync_autosuspend(dev); Notably, I've avoided testing the return codes for these, since they really should be ignored by callers, and we may make them 'void' altogether: pm_runtime_put(dev); pm_runtime_put_autosuspend(dev); Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Dhruva Gole <d-gole@ti.com> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 7f7acd1 commit d0b8651

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/base/power/runtime-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static void pm_runtime_already_suspended_test(struct kunit *test)
4242
pm_runtime_put(dev);
4343

4444
pm_runtime_get_noresume(dev);
45-
KUNIT_EXPECT_EQ(test, -EAGAIN, pm_runtime_put_sync(dev));
45+
KUNIT_EXPECT_EQ(test, 1, pm_runtime_put_sync(dev));
4646

4747
KUNIT_EXPECT_EQ(test, 1, pm_runtime_suspend(dev));
4848
KUNIT_EXPECT_EQ(test, 1, pm_runtime_autosuspend(dev));

drivers/base/power/runtime.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,9 @@ static int rpm_idle(struct device *dev, int rpmflags)
498498
if (retval < 0)
499499
; /* Conditions are wrong. */
500500

501+
else if ((rpmflags & RPM_GET_PUT) && retval == 1)
502+
; /* put() is allowed in RPM_SUSPENDED */
503+
501504
/* Idle notifications are allowed only in the RPM_ACTIVE state. */
502505
else if (dev->power.runtime_status != RPM_ACTIVE)
503506
retval = -EAGAIN;

0 commit comments

Comments
 (0)