diff options
| author | Anson Huang <b20788@freescale.com> | 2012-04-01 18:33:58 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:24:50 +0800 |
| commit | ea38c423a587dee6bd3eb2b43005037994ea8e87 (patch) | |
| tree | 2fd2f2e30664de3beea3d83acf503d86cdaf104f /drivers/cpufreq | |
| parent | 0d36f8226d2287c872ff97ff52e7324eb60e241d (diff) | |
ENGR00178646-1 [CPUFreq]Fix interactive governor bug
1. When system not boot up all cores, interactive governor
will not work;
2. Adjust the default timer_rate to 50ms instead of 20ms to
avoid too many freq up/down change.
Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 2ccd9dd12ae5..483e723ed942 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -77,7 +77,7 @@ static unsigned long min_sample_time; /* * The sample rate of the timer used to increase frequency */ -#define DEFAULT_TIMER_RATE (20 * USEC_PER_MSEC) +#define DEFAULT_TIMER_RATE (50 * USEC_PER_MSEC) #define CPUFREQ_IRQ_LEN 60 #define CPUFREQ_NOTE_LEN 120 static unsigned long timer_rate; @@ -376,7 +376,6 @@ static void cpufreq_interactive_idle_end(void) static int cpufreq_interactive_up_task(void *data) { unsigned int cpu; - cpumask_t tmp_mask; unsigned long flags; struct cpufreq_interactive_cpuinfo *pcpu; @@ -395,11 +394,10 @@ static int cpufreq_interactive_up_task(void *data) } set_current_state(TASK_RUNNING); - tmp_mask = up_cpumask; cpumask_clear(&up_cpumask); spin_unlock_irqrestore(&up_cpumask_lock, flags); - for_each_cpu(cpu, &tmp_mask) { + for_each_online_cpu(cpu) { unsigned int j; unsigned int max_freq = 0; @@ -411,7 +409,7 @@ static int cpufreq_interactive_up_task(void *data) mutex_lock(&set_speed_lock); - for_each_cpu(j, pcpu->policy->cpus) { + for_each_online_cpu(j) { struct cpufreq_interactive_cpuinfo *pjcpu = &per_cpu(cpuinfo, j); @@ -437,16 +435,14 @@ static int cpufreq_interactive_up_task(void *data) static void cpufreq_interactive_freq_down(struct work_struct *work) { unsigned int cpu; - cpumask_t tmp_mask; unsigned long flags; struct cpufreq_interactive_cpuinfo *pcpu; spin_lock_irqsave(&down_cpumask_lock, flags); - tmp_mask = down_cpumask; cpumask_clear(&down_cpumask); spin_unlock_irqrestore(&down_cpumask_lock, flags); - for_each_cpu(cpu, &tmp_mask) { + for_each_online_cpu(cpu) { unsigned int j; unsigned int max_freq = 0; @@ -458,7 +454,7 @@ static void cpufreq_interactive_freq_down(struct work_struct *work) mutex_lock(&set_speed_lock); - for_each_cpu(j, pcpu->policy->cpus) { + for_each_online_cpu(j) { struct cpufreq_interactive_cpuinfo *pjcpu = &per_cpu(cpuinfo, j); @@ -575,7 +571,7 @@ static ssize_t show_irq_param(struct kobject *kobj, j += scnprintf(&buf[j], CPUFREQ_NOTE_LEN, "Change irq setting by echo a data, format: 0xAABBBC, AA:irq number, BBB:up_threshold, C:enable\n"); for (i = 0; i < MAX_CPUFREQ_IRQ_NUMBER; i++) { if (irq_tuner_ins[i].irq_number != 0) - j += scnprintf(&buf[j], CPUFREQ_IRQ_LEN, "irq number: %d, up_threshold %d, %s\n", irq_tuner_ins[i].irq_number, irq_tuner_ins[i].up_threshold, irq_tuner_ins[i].enable ? "enabled" : "disabled"); + j += scnprintf(&buf[j], CPUFREQ_IRQ_LEN, "irq number: 0x%x, up_threshold 0x%x, %s\n", irq_tuner_ins[i].irq_number, irq_tuner_ins[i].up_threshold, irq_tuner_ins[i].enable ? "enabled" : "disabled"); } return j; |