|
@@ -65,7 +65,6 @@ enum {
|
|
|
struct acpi_cpufreq_data {
|
|
|
struct acpi_processor_performance *acpi_data;
|
|
|
struct cpufreq_frequency_table *freq_table;
|
|
|
- unsigned int max_freq;
|
|
|
unsigned int resume;
|
|
|
unsigned int cpu_feature;
|
|
|
};
|
|
@@ -340,7 +339,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,
|
|
|
|
|
|
#endif
|
|
|
|
|
|
- retval = (per_cpu(drv_data, policy->cpu)->max_freq * perf_percent) / 100;
|
|
|
+ retval = (policy->cpuinfo.max_freq * perf_percent) / 100;
|
|
|
|
|
|
return retval;
|
|
|
}
|
|
@@ -698,7 +697,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|
|
" latency at 20 uS\n");
|
|
|
}
|
|
|
|
|
|
- data->max_freq = perf->states[0].core_frequency * 1000;
|
|
|
/* table init */
|
|
|
for (i = 0; i < perf->state_count; i++) {
|
|
|
if (i > 0 && perf->states[i].core_frequency >=
|
|
@@ -717,6 +715,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|
|
if (result)
|
|
|
goto err_freqfree;
|
|
|
|
|
|
+ if (perf->states[0].core_frequency * 1000 != policy->cpuinfo.max_freq)
|
|
|
+ printk(KERN_WARNING FW_WARN "P-state 0 is not max freq\n");
|
|
|
+
|
|
|
switch (perf->control_register.space_id) {
|
|
|
case ACPI_ADR_SPACE_SYSTEM_IO:
|
|
|
/* Current speed is unknown and not detectable by IO port */
|