Commit 13966517 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM: runtime: Allow to call __pm_runtime_set_status() from atomic context 



The only two users of __pm_runtime_set_status() are pm_runtime_set_active()
and pm_runtime_set_suspended(). These are widely used and should be called
from non-atomic context to work as expected. However, it would be
convenient to allow them be called from atomic context too, as shown from a
subsequent change, so let's add support for this.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarMaulik Shah <quic_mkshah@quicinc.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e5a3b0c5

drivers/base/power/runtime.c

+5 −4
Original line number Diff line number Diff line
@@ -1210,12 +1210,13 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
{

	struct device *parent = dev->parent;

	bool notify_parent = false;

	unsigned long flags;

	int error = 0;



	if (status != RPM_ACTIVE && status != RPM_SUSPENDED)

		return -EINVAL;



	spin_lock_irq(&dev->power.lock);

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



	/*

	 * Prevent PM-runtime from being enabled for the device or return an
@@ -1226,7 +1227,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
	else

		error = -EAGAIN;



	spin_unlock_irq(&dev->power.lock);

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



	if (error)

		return error;
@@ -1247,7 +1248,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
		device_links_read_unlock(idx);

	}



	spin_lock_irq(&dev->power.lock);

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



	if (dev->power.runtime_status == status || !parent)

		goto out_set;
@@ -1288,7 +1289,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
		dev->power.runtime_error = 0;



 out:

	spin_unlock_irq(&dev->power.lock);

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



	if (notify_parent)

		pm_request_idle(parent);