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

Commit 3a090284 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: powerdomain/clockdomain: add a per-powerdomain spinlock 



Add a per-powerdomain spinlock.  Use that instead of the clockdomain
spinlock.  Add pwrdm_lock()/pwrdm_unlock() functions to allow other
code to acquire or release the powerdomain spinlock without reaching
directly into the struct powerdomain.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Jean Pihet <jean.pihet@newoldbits.com>
parent c4978fba

arch/arm/mach-omap2/clockdomain.c

+112 −60
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ static int _clkdm_register(struct clockdomain *clkdm) 


	pwrdm_add_clkdm(pwrdm, clkdm);



	spin_lock_init(&clkdm->lock);



	pr_debug("clockdomain: registered %s\n", clkdm->name);



	return 0;
@@ -734,18 +732,17 @@ int clkdm_clear_all_sleepdeps(struct clockdomain *clkdm) 
}



/**

 * clkdm_sleep - force clockdomain sleep transition

 * clkdm_sleep_nolock - force clockdomain sleep transition (lockless)

 * @clkdm: struct clockdomain *

 *

 * Instruct the CM to force a sleep transition on the specified

 * clockdomain @clkdm.  Returns -EINVAL if @clkdm is NULL or if

 * clockdomain does not support software-initiated sleep; 0 upon

 * success.

 * clockdomain @clkdm.  Only for use by the powerdomain code.  Returns

 * -EINVAL if @clkdm is NULL or if clockdomain does not support

 * software-initiated sleep; 0 upon success.

 */

int clkdm_sleep(struct clockdomain *clkdm)

int clkdm_sleep_nolock(struct clockdomain *clkdm)

{

	int ret;

	unsigned long flags;



	if (!clkdm)

		return -EINVAL;
@@ -761,27 +758,45 @@ int clkdm_sleep(struct clockdomain *clkdm) 


	pr_debug("clockdomain: forcing sleep on %s\n", clkdm->name);



	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;

	ret = arch_clkdm->clkdm_sleep(clkdm);

	ret |= pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	ret |= pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);



	return ret;

}



/**

 * clkdm_wakeup - force clockdomain wakeup transition

 * clkdm_sleep - force clockdomain sleep transition

 * @clkdm: struct clockdomain *

 *

 * Instruct the CM to force a wakeup transition on the specified

 * clockdomain @clkdm.  Returns -EINVAL if @clkdm is NULL or if the

 * clockdomain does not support software-controlled wakeup; 0 upon

 * Instruct the CM to force a sleep transition on the specified

 * clockdomain @clkdm.  Returns -EINVAL if @clkdm is NULL or if

 * clockdomain does not support software-initiated sleep; 0 upon

 * success.

 */

int clkdm_wakeup(struct clockdomain *clkdm)

int clkdm_sleep(struct clockdomain *clkdm)

{

	int ret;



	pwrdm_lock(clkdm->pwrdm.ptr);

	ret = clkdm_sleep_nolock(clkdm);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	return ret;

}



/**

 * clkdm_wakeup_nolock - force clockdomain wakeup transition (lockless)

 * @clkdm: struct clockdomain *

 *

 * Instruct the CM to force a wakeup transition on the specified

 * clockdomain @clkdm.  Only for use by the powerdomain code.  Returns

 * -EINVAL if @clkdm is NULL or if the clockdomain does not support

 * software-controlled wakeup; 0 upon success.

 */

int clkdm_wakeup_nolock(struct clockdomain *clkdm)

{

	int ret;

	unsigned long flags;



	if (!clkdm)

		return -EINVAL;
@@ -797,28 +812,46 @@ int clkdm_wakeup(struct clockdomain *clkdm) 


	pr_debug("clockdomain: forcing wakeup on %s\n", clkdm->name);



	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;

	ret = arch_clkdm->clkdm_wakeup(clkdm);

	ret |= pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	ret |= pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);



	return ret;

}



/**

 * clkdm_allow_idle - enable hwsup idle transitions for clkdm

 * clkdm_wakeup - force clockdomain wakeup transition

 * @clkdm: struct clockdomain *

 *

 * Allow the hardware to automatically switch the clockdomain @clkdm into

 * active or idle states, as needed by downstream clocks.  If the

 * Instruct the CM to force a wakeup transition on the specified

 * clockdomain @clkdm.  Returns -EINVAL if @clkdm is NULL or if the

 * clockdomain does not support software-controlled wakeup; 0 upon

 * success.

 */

int clkdm_wakeup(struct clockdomain *clkdm)

{

	int ret;



	pwrdm_lock(clkdm->pwrdm.ptr);

	ret = clkdm_wakeup_nolock(clkdm);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	return ret;

}



/**

 * clkdm_allow_idle_nolock - enable hwsup idle transitions for clkdm

 * @clkdm: struct clockdomain *

 *

 * Allow the hardware to automatically switch the clockdomain @clkdm

 * into active or idle states, as needed by downstream clocks.  If the

 * clockdomain has any downstream clocks enabled in the clock

 * framework, wkdep/sleepdep autodependencies are added; this is so

 * device drivers can read and write to the device.  No return value.

 * device drivers can read and write to the device.  Only for use by

 * the powerdomain code.  No return value.

 */

void clkdm_allow_idle(struct clockdomain *clkdm)

void clkdm_allow_idle_nolock(struct clockdomain *clkdm)

{

	unsigned long flags;



	if (!clkdm)

		return;
@@ -834,11 +867,26 @@ void clkdm_allow_idle(struct clockdomain *clkdm) 
	pr_debug("clockdomain: enabling automatic idle transitions for %s\n",

		 clkdm->name);



	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags |= _CLKDM_FLAG_HWSUP_ENABLED;

	arch_clkdm->clkdm_allow_idle(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);

}



/**

 * clkdm_allow_idle - enable hwsup idle transitions for clkdm

 * @clkdm: struct clockdomain *

 *

 * Allow the hardware to automatically switch the clockdomain @clkdm into

 * active or idle states, as needed by downstream clocks.  If the

 * clockdomain has any downstream clocks enabled in the clock

 * framework, wkdep/sleepdep autodependencies are added; this is so

 * device drivers can read and write to the device.  No return value.

 */

void clkdm_allow_idle(struct clockdomain *clkdm)

{

	pwrdm_lock(clkdm->pwrdm.ptr);

	clkdm_allow_idle_nolock(clkdm);

	pwrdm_unlock(clkdm->pwrdm.ptr);

}



/**
@@ -848,12 +896,11 @@ void clkdm_allow_idle(struct clockdomain *clkdm) 
 * Prevent the hardware from automatically switching the clockdomain

 * @clkdm into inactive or idle states.  If the clockdomain has

 * downstream clocks enabled in the clock framework, wkdep/sleepdep

 * autodependencies are removed.  No return value.

 * autodependencies are removed.  Only for use by the powerdomain

 * code.  No return value.

 */

void clkdm_deny_idle(struct clockdomain *clkdm)

void clkdm_deny_idle_nolock(struct clockdomain *clkdm)

{

	unsigned long flags;



	if (!clkdm)

		return;
@@ -869,11 +916,25 @@ void clkdm_deny_idle(struct clockdomain *clkdm) 
	pr_debug("clockdomain: disabling automatic idle transitions for %s\n",

		 clkdm->name);



	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags &= ~_CLKDM_FLAG_HWSUP_ENABLED;

	arch_clkdm->clkdm_deny_idle(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);

}



/**

 * clkdm_deny_idle - disable hwsup idle transitions for clkdm

 * @clkdm: struct clockdomain *

 *

 * Prevent the hardware from automatically switching the clockdomain

 * @clkdm into inactive or idle states.  If the clockdomain has

 * downstream clocks enabled in the clock framework, wkdep/sleepdep

 * autodependencies are removed.  No return value.

 */

void clkdm_deny_idle(struct clockdomain *clkdm)

{

	pwrdm_lock(clkdm->pwrdm.ptr);

	clkdm_deny_idle_nolock(clkdm);

	pwrdm_unlock(clkdm->pwrdm.ptr);

}



/**
@@ -890,14 +951,11 @@ void clkdm_deny_idle(struct clockdomain *clkdm) 
bool clkdm_in_hwsup(struct clockdomain *clkdm)

{

	bool ret;

	unsigned long flags;



	if (!clkdm)

		return false;



	spin_lock_irqsave(&clkdm->lock, flags);

	ret = (clkdm->_flags & _CLKDM_FLAG_HWSUP_ENABLED) ? true : false;

	spin_unlock_irqrestore(&clkdm->lock, flags);



	return ret;

}
@@ -923,12 +981,10 @@ bool clkdm_missing_idle_reporting(struct clockdomain *clkdm) 


static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)

{

	unsigned long flags;



	if (!clkdm || !arch_clkdm || !arch_clkdm->clkdm_clk_enable)

		return -EINVAL;



	spin_lock_irqsave(&clkdm->lock, flags);

	pwrdm_lock(clkdm->pwrdm.ptr);



	/*

	 * For arch's with no autodeps, clkcm_clk_enable
@@ -936,13 +992,13 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm) 
	 * enabled, so the clkdm can be force woken up.

	 */

	if ((atomic_inc_return(&clkdm->usecount) > 1) && autodeps) {

		spin_unlock_irqrestore(&clkdm->lock, flags);

		pwrdm_unlock(clkdm->pwrdm.ptr);

		return 0;

	}



	arch_clkdm->clkdm_clk_enable(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	pr_debug("clockdomain: %s: enabled\n", clkdm->name);
@@ -991,12 +1047,10 @@ int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) 
 */

int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)

{

	unsigned long flags;



	if (!clkdm || !clk || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)

		return -EINVAL;



	spin_lock_irqsave(&clkdm->lock, flags);

	pwrdm_lock(clkdm->pwrdm.ptr);



	/* corner case: disabling unused clocks */

	if ((__clk_get_enable_count(clk) == 0) &&
@@ -1004,23 +1058,23 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) 
		goto ccd_exit;



	if (atomic_read(&clkdm->usecount) == 0) {

		spin_unlock_irqrestore(&clkdm->lock, flags);

		pwrdm_unlock(clkdm->pwrdm.ptr);

		WARN_ON(1); /* underflow */

		return -ERANGE;

	}



	if (atomic_dec_return(&clkdm->usecount) > 0) {

		spin_unlock_irqrestore(&clkdm->lock, flags);

		pwrdm_unlock(clkdm->pwrdm.ptr);

		return 0;

	}



	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);



	pr_debug("clockdomain: %s: disabled\n", clkdm->name);



ccd_exit:

	spin_unlock_irqrestore(&clkdm->lock, flags);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	return 0;

}
@@ -1073,8 +1127,6 @@ int clkdm_hwmod_enable(struct clockdomain *clkdm, struct omap_hwmod *oh) 
 */

int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh)

{

	unsigned long flags;



	/* The clkdm attribute does not exist yet prior OMAP4 */

	if (cpu_is_omap24xx() || cpu_is_omap34xx())

		return 0;
@@ -1087,22 +1139,22 @@ int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh) 
	if (!clkdm || !oh || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)

		return -EINVAL;



	spin_lock_irqsave(&clkdm->lock, flags);

	pwrdm_lock(clkdm->pwrdm.ptr);



	if (atomic_read(&clkdm->usecount) == 0) {

		spin_unlock_irqrestore(&clkdm->lock, flags);

		pwrdm_unlock(clkdm->pwrdm.ptr);

		WARN_ON(1); /* underflow */

		return -ERANGE;

	}



	if (atomic_dec_return(&clkdm->usecount) > 0) {

		spin_unlock_irqrestore(&clkdm->lock, flags);

		pwrdm_unlock(clkdm->pwrdm.ptr);

		return 0;

	}



	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

	pwrdm_state_switch_nolock(clkdm->pwrdm.ptr);

	pwrdm_unlock(clkdm->pwrdm.ptr);



	pr_debug("clockdomain: %s: disabled\n", clkdm->name);

arch/arm/mach-omap2/clockdomain.h

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#define __ARCH_ARM_MACH_OMAP2_CLOCKDOMAIN_H



#include <linux/init.h>

#include <linux/spinlock.h>



#include "powerdomain.h"

#include "clock.h"
@@ -139,7 +138,6 @@ struct clockdomain { 
	struct clkdm_dep *sleepdep_srcs;

	atomic_t usecount;

	struct list_head node;

	spinlock_t lock;

};



/**
@@ -196,12 +194,16 @@ int clkdm_del_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2); 
int clkdm_read_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2);

int clkdm_clear_all_sleepdeps(struct clockdomain *clkdm);



void clkdm_allow_idle_nolock(struct clockdomain *clkdm);

void clkdm_allow_idle(struct clockdomain *clkdm);

void clkdm_deny_idle_nolock(struct clockdomain *clkdm);

void clkdm_deny_idle(struct clockdomain *clkdm);

bool clkdm_in_hwsup(struct clockdomain *clkdm);

bool clkdm_missing_idle_reporting(struct clockdomain *clkdm);



int clkdm_wakeup_nolock(struct clockdomain *clkdm);

int clkdm_wakeup(struct clockdomain *clkdm);

int clkdm_sleep_nolock(struct clockdomain *clkdm);

int clkdm_sleep(struct clockdomain *clkdm);



int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk);

arch/arm/mach-omap2/powerdomain.c

+52 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/list.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/spinlock.h>

#include <trace/events/power.h>



#include "cm2xxx_3xxx.h"
@@ -111,6 +112,7 @@ static int _pwrdm_register(struct powerdomain *pwrdm) 
	pwrdm->voltdm.ptr = voltdm;

	INIT_LIST_HEAD(&pwrdm->voltdm_node);

	voltdm_add_pwrdm(voltdm, pwrdm);

	spin_lock_init(&pwrdm->_lock);



	list_add(&pwrdm->node, &pwrdm_list);
@@ -241,7 +243,7 @@ static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm, 
			sleep_switch = LOWPOWERSTATE_SWITCH;

		} else {

			*hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);

			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);

			clkdm_wakeup_nolock(pwrdm->pwrdm_clkdms[0]);

			sleep_switch = FORCEWAKEUP_SWITCH;

		}

	} else {
@@ -271,15 +273,15 @@ static void _pwrdm_restore_clkdm_state(struct powerdomain *pwrdm, 
	switch (sleep_switch) {

	case FORCEWAKEUP_SWITCH:

		if (hwsup)

			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);

			clkdm_allow_idle_nolock(pwrdm->pwrdm_clkdms[0]);

		else

			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);

			clkdm_sleep_nolock(pwrdm->pwrdm_clkdms[0]);

		break;

	case LOWPOWERSTATE_SWITCH:

		if (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE &&

		    arch_pwrdm->pwrdm_set_lowpwrstchange)

			arch_pwrdm->pwrdm_set_lowpwrstchange(pwrdm);

		pwrdm_state_switch(pwrdm);

		pwrdm_state_switch_nolock(pwrdm);

		break;

	}

}
@@ -359,6 +361,30 @@ int pwrdm_complete_init(void) 
	return 0;

}



/**

 * pwrdm_lock - acquire a Linux spinlock on a powerdomain

 * @pwrdm: struct powerdomain * to lock

 *

 * Acquire the powerdomain spinlock on @pwrdm.  No return value.

 */

void pwrdm_lock(struct powerdomain *pwrdm)

	__acquires(&pwrdm->_lock)

{

	spin_lock_irqsave(&pwrdm->_lock, pwrdm->_lock_flags);

}



/**

 * pwrdm_unlock - release a Linux spinlock on a powerdomain

 * @pwrdm: struct powerdomain * to unlock

 *

 * Release the powerdomain spinlock on @pwrdm.  No return value.

 */

void pwrdm_unlock(struct powerdomain *pwrdm)

	__releases(&pwrdm->_lock)

{

	spin_unlock_irqrestore(&pwrdm->_lock, pwrdm->_lock_flags);

}



/**

 * pwrdm_lookup - look up a powerdomain by name, return a pointer

 * @name: name of powerdomain
@@ -1005,7 +1031,7 @@ bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm) 
	return (pwrdm && pwrdm->flags & PWRDM_HAS_HDWR_SAR) ? 1 : 0;

}



int pwrdm_state_switch(struct powerdomain *pwrdm)

int pwrdm_state_switch_nolock(struct powerdomain *pwrdm)

{

	int ret;
@@ -1019,6 +1045,17 @@ int pwrdm_state_switch(struct powerdomain *pwrdm) 
	return ret;

}



int __deprecated pwrdm_state_switch(struct powerdomain *pwrdm)

{

	int ret;



	pwrdm_lock(pwrdm);

	ret = pwrdm_state_switch_nolock(pwrdm);

	pwrdm_unlock(pwrdm);



	return ret;

}



int pwrdm_pre_transition(struct powerdomain *pwrdm)

{

	if (pwrdm)
@@ -1067,15 +1104,19 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 pwrst) 
		pwrst--;

	}



	pwrdm_lock(pwrdm);



	curr_pwrst = pwrdm_read_pwrst(pwrdm);

	next_pwrst = pwrdm_read_next_pwrst(pwrdm);

	if (curr_pwrst == pwrst && next_pwrst == pwrst)

		return ret;

		goto osps_out;



	sleep_switch = _pwrdm_save_clkdm_state_and_activate(pwrdm, curr_pwrst,

							    pwrst, &hwsup);

	if (sleep_switch == ERROR_SWITCH)

		return -EINVAL;

	if (sleep_switch == ERROR_SWITCH) {

		ret = -EINVAL;

		goto osps_out;

	}



	ret = pwrdm_set_next_pwrst(pwrdm, pwrst);

	if (ret)
@@ -1084,6 +1125,9 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 pwrst) 


	_pwrdm_restore_clkdm_state(pwrdm, sleep_switch, hwsup);



osps_out:

	pwrdm_unlock(pwrdm);



	return ret;

}

arch/arm/mach-omap2/powerdomain.h

+8 −3
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 


#include <linux/types.h>

#include <linux/list.h>



#include <linux/atomic.h>

#include <linux/spinlock.h>



#include "voltage.h"
@@ -103,6 +102,8 @@ struct powerdomain; 
 * @state_counter:

 * @timer:

 * @state_timer:

 * @_lock: spinlock used to serialize powerdomain and some clockdomain ops

 * @_lock_flags: stored flags when @_lock is taken

 *

 * @prcm_partition possible values are defined in mach-omap2/prcm44xx.h.

 */
@@ -127,7 +128,8 @@ struct powerdomain { 
	unsigned state_counter[PWRDM_MAX_PWRSTS];

	unsigned ret_logic_off_counter;

	unsigned ret_mem_off_counter[PWRDM_MAX_MEM_BANKS];



	spinlock_t _lock;

	unsigned long _lock_flags;

	const u8 pwrstctrl_offs;

	const u8 pwrstst_offs;

	const u32 logicretstate_mask;
@@ -235,6 +237,7 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm); 
int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm);

bool pwrdm_has_hdwr_sar(struct powerdomain *pwrdm);



int pwrdm_state_switch_nolock(struct powerdomain *pwrdm);

int pwrdm_state_switch(struct powerdomain *pwrdm);

int pwrdm_pre_transition(struct powerdomain *pwrdm);

int pwrdm_post_transition(struct powerdomain *pwrdm);
@@ -262,5 +265,7 @@ extern u32 omap2_pwrdm_get_mem_bank_stst_mask(u8 bank); 
extern struct powerdomain wkup_omap2_pwrdm;

extern struct powerdomain gfx_omap2_pwrdm;



extern void pwrdm_lock(struct powerdomain *pwrdm);

extern void pwrdm_unlock(struct powerdomain *pwrdm);



#endif