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

Commit e5d98d42 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 81302b1c7c99 ("ALSA: hda: Fix unhandled register update during auto-suspend period")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 59aba9d5

drivers/base/power/runtime.c

+11 −2
Original line number Diff line number Diff line
@@ -1048,9 +1048,11 @@ int __pm_runtime_idle(struct device *dev, int rpmflags) 
	int retval;



	if (rpmflags & RPM_GET_PUT) {

		if (!atomic_dec_and_test(&dev->power.usage_count))

		if (!atomic_dec_and_test(&dev->power.usage_count)) {

			trace_rpm_usage_rcuidle(dev, rpmflags);

			return 0;

		}

	}



	might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
@@ -1080,9 +1082,11 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags) 
	int retval;



	if (rpmflags & RPM_GET_PUT) {

		if (!atomic_dec_and_test(&dev->power.usage_count))

		if (!atomic_dec_and_test(&dev->power.usage_count)) {

			trace_rpm_usage_rcuidle(dev, rpmflags);

			return 0;

		}

	}



	might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
@@ -1143,6 +1147,7 @@ int pm_runtime_get_if_in_use(struct device *dev) 
	retval = dev->power.disable_depth > 0 ? -EINVAL :

		dev->power.runtime_status == RPM_ACTIVE

			&& atomic_inc_not_zero(&dev->power.usage_count);

	trace_rpm_usage_rcuidle(dev, 0);

	spin_unlock_irqrestore(&dev->power.lock, flags);

	return retval;

}
@@ -1476,6 +1481,8 @@ void pm_runtime_allow(struct device *dev) 
	dev->power.runtime_auto = true;

	if (atomic_dec_and_test(&dev->power.usage_count))

		rpm_idle(dev, RPM_AUTO | RPM_ASYNC);

	else

		trace_rpm_usage_rcuidle(dev, RPM_AUTO | RPM_ASYNC);



 out:

	spin_unlock_irq(&dev->power.lock);
@@ -1543,6 +1550,8 @@ static void update_autosuspend(struct device *dev, int old_delay, int old_use) 
		if (!old_use || old_delay >= 0) {

			atomic_inc(&dev->power.usage_count);

			rpm_resume(dev, 0);

		} else {

			trace_rpm_usage_rcuidle(dev, 0);

		}

	}

include/trace/events/rpm.h

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ DEFINE_EVENT(rpm_internal, rpm_idle, 


	TP_ARGS(dev, flags)

);

DEFINE_EVENT(rpm_internal, rpm_usage,



	TP_PROTO(struct device *dev, int flags),



	TP_ARGS(dev, flags)

);



TRACE_EVENT(rpm_return_int,

	TP_PROTO(struct device *dev, unsigned long ip, int ret),