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

PM: Allow the clocks management code to be used during system suspend 



The common clocks management code in drivers/base/power/clock_ops.c
is going to be used during system-wide power transitions as well as
for runtime PM, so it shouldn't depend on CONFIG_PM_RUNTIME.
However, the suspend/resume functions provided by it for
CONFIG_PM_RUNTIME unset, to be used during system-wide power
transitions, should not behave in the same way as their counterparts
defined for CONFIG_PM_RUNTIME set, because in that case the clocks
are managed differently at run time.

The names of the functions still contain the word "runtime" after
this change, but that is going to be modified by a separate patch
later.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
parent d4f2d87a

drivers/base/power/clock_ops.c

+59 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/slab.h>

#include <linux/err.h>



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM



struct pm_runtime_clk_data {

	struct list_head clock_list;
@@ -191,6 +191,10 @@ void pm_runtime_clk_destroy(struct device *dev) 
	kfree(prd);

}



#endif /* CONFIG_PM */



#ifdef CONFIG_PM_RUNTIME



/**

 * pm_runtime_clk_acquire - Acquire a device clock.

 * @dev: Device whose clock is to be acquired.
@@ -330,6 +334,60 @@ static int pm_runtime_clk_notify(struct notifier_block *nb, 


#else /* !CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM



/**

 * pm_runtime_clk_suspend - Disable clocks in a device's PM clock list.

 * @dev: Device to disable the clocks for.

 */

int pm_runtime_clk_suspend(struct device *dev)

{

	struct pm_runtime_clk_data *prd = __to_prd(dev);

	struct pm_clock_entry *ce;



	dev_dbg(dev, "%s()\n", __func__);



	/* If there is no driver, the clocks are already disabled. */

	if (!prd || !dev->driver)

		return 0;



	mutex_lock(&prd->lock);



	list_for_each_entry_reverse(ce, &prd->clock_list, node)

		clk_disable(ce->clk);



	mutex_unlock(&prd->lock);



	return 0;

}



/**

 * pm_runtime_clk_resume - Enable clocks in a device's PM clock list.

 * @dev: Device to enable the clocks for.

 */

int pm_runtime_clk_resume(struct device *dev)

{

	struct pm_runtime_clk_data *prd = __to_prd(dev);

	struct pm_clock_entry *ce;



	dev_dbg(dev, "%s()\n", __func__);



	/* If there is no driver, the clocks should remain disabled. */

	if (!prd || !dev->driver)

		return 0;



	mutex_lock(&prd->lock);



	list_for_each_entry(ce, &prd->clock_list, node)

		clk_enable(ce->clk);



	mutex_unlock(&prd->lock);



	return 0;

}



#endif /* CONFIG_PM */



/**

 * enable_clock - Enable a device clock.

 * @dev: Device whose clock is to be enabled.

include/linux/pm_runtime.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ struct pm_clk_notifier_block { 
	char *con_ids[];

};



#ifdef CONFIG_PM_RUNTIME_CLK

#ifdef CONFIG_PM_CLK

extern int pm_runtime_clk_init(struct device *dev);

extern void pm_runtime_clk_destroy(struct device *dev);

extern int pm_runtime_clk_add(struct device *dev, const char *con_id);

kernel/power/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -224,9 +224,9 @@ config PM_OPP 
	  implementations a ready to use framework to manage OPPs.

	  For more information, read <file:Documentation/power/opp.txt>



config PM_RUNTIME_CLK

config PM_CLK

	def_bool y

	depends on PM_RUNTIME && HAVE_CLK

	depends on PM && HAVE_CLK



config PM_GENERIC_DOMAINS

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE