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

Commit b8488fbe authored by Hiroshi DOYU's avatar Hiroshi DOYU Committed by Tony Lindgren
Browse files

ARM: OMAP: Fix sleep under spinlock for cpufreq 



[   10.523437] BUG: sleeping function called from invalid context at kernel/mut6
[   10.523437] in_atomic():0, irqs_disabled():128
[   10.523437] [<c002c168>] (dump_stack+0x0/0x14) from [<c005374c>] (__might_sl)
[   10.523437] [<c0053698>] (__might_sleep+0x0/0xd4) from [<c024fdf4>] (mutex_l)
[   10.523437]  r5 = C02F0DE8  r4 = C02F0DF0
[   10.523437] [<c024fdd4>] (mutex_lock+0x0/0x44) from [<c0041df4>] (clk_get+0x)
[   10.523437]  r4 = 00000000
[   10.523437] [<c0041da4>] (clk_get+0x0/0x128) from [<c0046520>] (omap_getspee)
[   10.523437]  r8 = 00000002  r7 = 00000000  r6 = C031DAF8  r5 = C0473980
[   10.523437]  r4 = 00000000
[   10.523437] [<c00464fc>] (omap_getspeed+0x0/0x5c) from [<c01b8518>] (cpufreq)
[   10.523437]  r5 = C0473980  r4 = 00000002

Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 538528de

arch/arm/plat-omap/cpu-omap.c

+10 −22
Original line number Diff line number Diff line
@@ -33,43 +33,33 @@ 
#define MPU_CLK		"virt_prcm_set"

#endif



static struct clk *mpu_clk;



/* TODO: Add support for SDRAM timing changes */



int omap_verify_speed(struct cpufreq_policy *policy)

{

	struct clk * mpu_clk;



	if (policy->cpu)

		return -EINVAL;



	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

				     policy->cpuinfo.max_freq);

	mpu_clk = clk_get(NULL, MPU_CLK);

	if (IS_ERR(mpu_clk))

		return PTR_ERR(mpu_clk);



	policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000;

	policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000;

	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

				     policy->cpuinfo.max_freq);

	clk_put(mpu_clk);



	return 0;

}



unsigned int omap_getspeed(unsigned int cpu)

{

	struct clk * mpu_clk;

	unsigned long rate;



	if (cpu)

		return 0;



	mpu_clk = clk_get(NULL, MPU_CLK);

	if (IS_ERR(mpu_clk))

		return 0;

	rate = clk_get_rate(mpu_clk) / 1000;

	clk_put(mpu_clk);



	return rate;

}
@@ -77,14 +67,9 @@ static int omap_target(struct cpufreq_policy *policy, 
		       unsigned int target_freq,

		       unsigned int relation)

{

	struct clk * mpu_clk;

	struct cpufreq_freqs freqs;

	int ret = 0;



	mpu_clk = clk_get(NULL, MPU_CLK);

	if (IS_ERR(mpu_clk))

		return PTR_ERR(mpu_clk);



	freqs.old = omap_getspeed(0);

	freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000;

	freqs.cpu = 0;
@@ -92,15 +77,12 @@ static int omap_target(struct cpufreq_policy *policy, 
	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	ret = clk_set_rate(mpu_clk, target_freq * 1000);

	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	clk_put(mpu_clk);



	return ret;

}



static int __init omap_cpu_init(struct cpufreq_policy *policy)

{

	struct clk * mpu_clk;



	mpu_clk = clk_get(NULL, MPU_CLK);

	if (IS_ERR(mpu_clk))

		return PTR_ERR(mpu_clk);
@@ -111,17 +93,23 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;

	policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	clk_put(mpu_clk);



	return 0;

}



static int omap_cpu_exit(struct cpufreq_policy *policy)

{

	clk_put(mpu_clk);

	return 0;

}



static struct cpufreq_driver omap_driver = {

	.flags		= CPUFREQ_STICKY,

	.verify		= omap_verify_speed,

	.target		= omap_target,

	.get		= omap_getspeed,

	.init		= omap_cpu_init,

	.exit		= omap_cpu_exit,

	.name		= "omap",

};