Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[CPUFREQ] Bug fix for acpi-cpufreq and cpufreq_stats oops on frequency change notification

Browse source 
Fixes the oops in cpufreq_stats with acpi_cpufreq driver.  The issue was
that the frequency was reported as 0 in acpi-cpufreq.c.  The bug is due to
different indicies for freq_table and ACPI perf table.

Also adds a check in cpufreq_stats to check for error return from
freq_table_get_index() and avoid using the error return value.

Patch fixes the issue reported at
http://www.ussg.iu.edu/hypermail/linux/kernel/0611.2/0629.html
and also other similar issue here
http://bugme.osdl.org/show_bug.cgi?id=7383 comment 53

Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Jones <davej@redhat.com>
This commit is contained in:
Venkatesh Pallipadi 2006-12-19 12:58:55 -08:00 • committed by Dave Jones
parent 917325d30a
commit 8edc59d939
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
View file

@ -373,8 +373,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
cpumask_t online_policy_cpus; cpumask_t online_policy_cpus;
struct drv_cmd cmd; struct drv_cmd cmd;
unsigned int msr; unsigned int msr;
unsigned int next_state = 0; unsigned int next_state = 0; /* Index into freq_table */
unsigned int next_perf_state = 0; unsigned int next_perf_state = 0; /* Index into perf table */
unsigned int i; unsigned int i;
int result = 0; int result = 0;
@ -439,8 +439,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
else else
cpu_set(policy->cpu, cmd.mask); cpu_set(policy->cpu, cmd.mask);
freqs.old = data->freq_table[perf->state].frequency; freqs.old = perf->states[perf->state].core_frequency * 1000;
freqs.new = data->freq_table[next_perf_state].frequency; freqs.new = data->freq_table[next_state].frequency;
for_each_cpu_mask(i, cmd.mask) { for_each_cpu_mask(i, cmd.mask) {
freqs.cpu = i; freqs.cpu = i;
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
@ -677,6 +677,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
valid_states++; valid_states++;
} }
data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END; data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
perf->state = 0;
result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table); result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
if (result) if (result)

4
drivers/cpufreq/cpufreq_stats.c
View file

@ -285,6 +285,7 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
stat = cpufreq_stats_table[freq->cpu]; stat = cpufreq_stats_table[freq->cpu];
if (!stat) if (!stat)
return 0; return 0;
old_index = freq_table_get_index(stat, freq->old); old_index = freq_table_get_index(stat, freq->old);
new_index = freq_table_get_index(stat, freq->new); new_index = freq_table_get_index(stat, freq->new);
@ -292,6 +293,9 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
if (old_index == new_index) if (old_index == new_index)
return 0; return 0;
if (old_index == -1 || new_index == -1)
return 0;
spin_lock(&cpufreq_stats_lock); spin_lock(&cpufreq_stats_lock);
stat->last_index = new_index; stat->last_index = new_index;
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS #ifdef CONFIG_CPU_FREQ_STAT_DETAILS