Commit d6649bc7 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] ppc32: small cpufreq update 



This patch adds a missing attribute to pmac cpufreq so that
"scaling_available_frequencies" works.  It also cleans up the duplicate
definitions for low and high speed constants.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJohn Clemens <clemej@alum.rpi.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c5924b7d

arch/ppc/platforms/pmac_cpufreq.c

+18 −14
Original line number Diff line number Diff line
@@ -85,14 +85,11 @@ static int no_schedule; 
static int has_cpu_l2lve;





#define PMAC_CPU_LOW_SPEED	1

#define PMAC_CPU_HIGH_SPEED	0



/* There are only two frequency states for each processor. Values

 * are in kHz for the time being.

 */

#define CPUFREQ_HIGH                  PMAC_CPU_HIGH_SPEED

#define CPUFREQ_LOW                   PMAC_CPU_LOW_SPEED

#define CPUFREQ_HIGH                  0

#define CPUFREQ_LOW                   1



static struct cpufreq_frequency_table pmac_cpu_freqs[] = {

	{CPUFREQ_HIGH, 		0},
@@ -100,6 +97,11 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = { 
	{0,			CPUFREQ_TABLE_END},

};



static struct freq_attr* pmac_cpu_freqs_attr[] = {

	&cpufreq_freq_attr_scaling_available_freqs,

	NULL,

};



static inline void local_delay(unsigned long ms)

{

	if (no_schedule)
@@ -355,7 +357,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify) 
	static unsigned long prev_l3cr;



	freqs.old = cur_freq;

	freqs.new = (speed_mode == PMAC_CPU_HIGH_SPEED) ? hi_freq : low_freq;

	freqs.new = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;

	freqs.cpu = smp_processor_id();



	if (freqs.old == freqs.new)
@@ -363,7 +365,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify) 


	if (notify)

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	if (speed_mode == PMAC_CPU_LOW_SPEED &&

	if (speed_mode == CPUFREQ_LOW &&

	    cpu_has_feature(CPU_FTR_L3CR)) {

		l3cr = _get_L3CR();

		if (l3cr & L3CR_L3E) {
@@ -371,8 +373,8 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify) 
			_set_L3CR(0);

		}

	}

	set_speed_proc(speed_mode == PMAC_CPU_LOW_SPEED);

	if (speed_mode == PMAC_CPU_HIGH_SPEED &&

	set_speed_proc(speed_mode == CPUFREQ_LOW);

	if (speed_mode == CPUFREQ_HIGH &&

	    cpu_has_feature(CPU_FTR_L3CR)) {

		l3cr = _get_L3CR();

		if ((prev_l3cr & L3CR_L3E) && l3cr != prev_l3cr)
@@ -380,7 +382,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify) 
	}

	if (notify)

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	cur_freq = (speed_mode == PMAC_CPU_HIGH_SPEED) ? hi_freq : low_freq;

	cur_freq = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;



	return 0;

}
@@ -423,7 +425,8 @@ static int __pmac pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.transition_latency	= CPUFREQ_ETERNAL;

	policy->cur = cur_freq;



	return cpufreq_frequency_table_cpuinfo(policy, &pmac_cpu_freqs[0]);

	cpufreq_frequency_table_get_attr(pmac_cpu_freqs, policy->cpu);

	return cpufreq_frequency_table_cpuinfo(policy, pmac_cpu_freqs);

}



static u32 __pmac read_gpio(struct device_node *np)
@@ -457,7 +460,7 @@ static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, u32 state) 
	no_schedule = 1;

	sleep_freq = cur_freq;

	if (cur_freq == low_freq)

		do_set_cpu_speed(PMAC_CPU_HIGH_SPEED, 0);

		do_set_cpu_speed(CPUFREQ_HIGH, 0);

	return 0;

}
@@ -473,8 +476,8 @@ static int __pmac pmac_cpufreq_resume(struct cpufreq_policy *policy) 
	 * is that we force a switch to whatever it was, which is

	 * probably high speed due to our suspend() routine

	 */

	do_set_cpu_speed(sleep_freq == low_freq ? PMAC_CPU_LOW_SPEED

			 : PMAC_CPU_HIGH_SPEED, 0);

	do_set_cpu_speed(sleep_freq == low_freq ?

			 CPUFREQ_LOW : CPUFREQ_HIGH, 0);



	no_schedule = 0;

	return 0;
@@ -488,6 +491,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = { 
	.suspend	= pmac_cpufreq_suspend,

	.resume		= pmac_cpufreq_resume,

	.flags		= CPUFREQ_PM_NO_WARN,

	.attr		= pmac_cpu_freqs_attr,

	.name		= "powermac",

	.owner		= THIS_MODULE,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE