UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: John Clemens <clemej@alum.rpi.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Benjamin Herrenschmidt 2005-05-27 12:52:56 -07:00 committed by Linus Torvalds
parent c5924b7d97
commit d6649bc76a
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/ppc/platforms/pmac_cpufreq.c
View File

@ -85,14 +85,11 @@ static int no_schedule;
static int has_cpu_l2lve; 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 /* There are only two frequency states for each processor. Values
* are in kHz for the time being. * are in kHz for the time being.
*/ */
#define CPUFREQ_HIGH PMAC_CPU_HIGH_SPEED #define CPUFREQ_HIGH 0
#define CPUFREQ_LOW PMAC_CPU_LOW_SPEED #define CPUFREQ_LOW 1
static struct cpufreq_frequency_table pmac_cpu_freqs[] = { static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
{CPUFREQ_HIGH, 0}, {CPUFREQ_HIGH, 0},
@ -100,6 +97,11 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
{0, CPUFREQ_TABLE_END}, {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) static inline void local_delay(unsigned long ms)
{ {
if (no_schedule) if (no_schedule)
@ -355,7 +357,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
static unsigned long prev_l3cr; static unsigned long prev_l3cr;
freqs.old = cur_freq; 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(); freqs.cpu = smp_processor_id();
if (freqs.old == freqs.new) if (freqs.old == freqs.new)
@ -363,7 +365,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
if (notify) if (notify)
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
if (speed_mode == PMAC_CPU_LOW_SPEED && if (speed_mode == CPUFREQ_LOW &&
cpu_has_feature(CPU_FTR_L3CR)) { cpu_has_feature(CPU_FTR_L3CR)) {
l3cr = _get_L3CR(); l3cr = _get_L3CR();
if (l3cr & L3CR_L3E) { if (l3cr & L3CR_L3E) {
@ -371,8 +373,8 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
_set_L3CR(0); _set_L3CR(0);
} }
} }
set_speed_proc(speed_mode == PMAC_CPU_LOW_SPEED); set_speed_proc(speed_mode == CPUFREQ_LOW);
if (speed_mode == PMAC_CPU_HIGH_SPEED && if (speed_mode == CPUFREQ_HIGH &&
cpu_has_feature(CPU_FTR_L3CR)) { cpu_has_feature(CPU_FTR_L3CR)) {
l3cr = _get_L3CR(); l3cr = _get_L3CR();
if ((prev_l3cr & L3CR_L3E) && l3cr != prev_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) if (notify)
cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); 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; return 0;
} }
@ -423,7 +425,8 @@ static int __pmac pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = cur_freq; 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) 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; no_schedule = 1;
sleep_freq = cur_freq; sleep_freq = cur_freq;
if (cur_freq == low_freq) if (cur_freq == low_freq)
do_set_cpu_speed(PMAC_CPU_HIGH_SPEED, 0); do_set_cpu_speed(CPUFREQ_HIGH, 0);
return 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 * is that we force a switch to whatever it was, which is
* probably high speed due to our suspend() routine * probably high speed due to our suspend() routine
*/ */
do_set_cpu_speed(sleep_freq == low_freq ? PMAC_CPU_LOW_SPEED do_set_cpu_speed(sleep_freq == low_freq ?
: PMAC_CPU_HIGH_SPEED, 0); CPUFREQ_LOW : CPUFREQ_HIGH, 0);
no_schedule = 0; no_schedule = 0;
return 0; return 0;
@ -488,6 +491,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = {
.suspend = pmac_cpufreq_suspend, .suspend = pmac_cpufreq_suspend,
.resume = pmac_cpufreq_resume, .resume = pmac_cpufreq_resume,
.flags = CPUFREQ_PM_NO_WARN, .flags = CPUFREQ_PM_NO_WARN,
.attr = pmac_cpu_freqs_attr,
.name = "powermac", .name = "powermac",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };