Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Commit e5d98d4

Browse files
osctobegregkh
authored andcommitted
PM-runtime: add tracepoints for usage_count changes
[ Upstream commit d229290689ae0f6eae068ef142de4fd61ab4ba50 ] Add tracepoints to remaining places where device's power.usage_count is changed. This helps debugging where and why autosuspend is prevented. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Stable-dep-of: 81302b1c7c99 ("ALSA: hda: Fix unhandled register update during auto-suspend period") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 59aba9d commit e5d98d4

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

drivers/base/power/runtime.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,8 +1048,10 @@ int __pm_runtime_idle(struct device *dev, int rpmflags)
10481048
int retval;
10491049

10501050
if (rpmflags & RPM_GET_PUT) {
1051-
if (!atomic_dec_and_test(&dev->power.usage_count))
1051+
if (!atomic_dec_and_test(&dev->power.usage_count)) {
1052+
trace_rpm_usage_rcuidle(dev, rpmflags);
10521053
return 0;
1054+
}
10531055
}
10541056

10551057
might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
@@ -1080,8 +1082,10 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags)
10801082
int retval;
10811083

10821084
if (rpmflags & RPM_GET_PUT) {
1083-
if (!atomic_dec_and_test(&dev->power.usage_count))
1085+
if (!atomic_dec_and_test(&dev->power.usage_count)) {
1086+
trace_rpm_usage_rcuidle(dev, rpmflags);
10841087
return 0;
1088+
}
10851089
}
10861090

10871091
might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
@@ -1143,6 +1147,7 @@ int pm_runtime_get_if_in_use(struct device *dev)
11431147
retval = dev->power.disable_depth > 0 ? -EINVAL :
11441148
dev->power.runtime_status == RPM_ACTIVE
11451149
&& atomic_inc_not_zero(&dev->power.usage_count);
1150+
trace_rpm_usage_rcuidle(dev, 0);
11461151
spin_unlock_irqrestore(&dev->power.lock, flags);
11471152
return retval;
11481153
}
@@ -1476,6 +1481,8 @@ void pm_runtime_allow(struct device *dev)
14761481
dev->power.runtime_auto = true;
14771482
if (atomic_dec_and_test(&dev->power.usage_count))
14781483
rpm_idle(dev, RPM_AUTO | RPM_ASYNC);
1484+
else
1485+
trace_rpm_usage_rcuidle(dev, RPM_AUTO | RPM_ASYNC);
14791486

14801487
out:
14811488
spin_unlock_irq(&dev->power.lock);
@@ -1543,6 +1550,8 @@ static void update_autosuspend(struct device *dev, int old_delay, int old_use)
15431550
if (!old_use || old_delay >= 0) {
15441551
atomic_inc(&dev->power.usage_count);
15451552
rpm_resume(dev, 0);
1553+
} else {
1554+
trace_rpm_usage_rcuidle(dev, 0);
15461555
}
15471556
}
15481557

include/trace/events/rpm.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ DEFINE_EVENT(rpm_internal, rpm_idle,
7474

7575
TP_ARGS(dev, flags)
7676
);
77+
DEFINE_EVENT(rpm_internal, rpm_usage,
78+
79+
TP_PROTO(struct device *dev, int flags),
80+
81+
TP_ARGS(dev, flags)
82+
);
7783

7884
TRACE_EVENT(rpm_return_int,
7985
TP_PROTO(struct device *dev, unsigned long ip, int ret),

0 commit comments

Comments
 (0)