Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CPUFREQ] speedstep-centrino should ignore upper performance control bits

Browse Source 
On some systems there could be bits set in the upper half of
the control value provided by the _PSS object.  These bits are
only relevant for cpufreq drivers that use IO ports which are not
currently supported by the speedstep-centrino driver.  The current
MSR oriented code assumes that upper bits are not set and thus
fails to work correctly when they are.  e.g. the control and status
value equality check failed on the IBM x3650 even though the ACPI
spec allows inequality.

Signed-off-by: Gary Hade <garyhade@us.ibm.com>
Signed-off-by: Dave Jones <davej@redhat.com>
This commit is contained in:
Gary Hade 2006-11-10 11:20:47 -08:00 committed by Dave Jones
parent 55e337345d
commit 8b9c6671f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
View File

@ -36,6 +36,7 @@
#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg) #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)
#define INTEL_MSR_RANGE (0xffff)
struct cpu_id struct cpu_id
{ {
@ -463,8 +464,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
} }
for (i=0; i<p->state_count; i++) { for (i=0; i<p->state_count; i++) {
if (p->states[i].control != p->states[i].status) { if ((p->states[i].control & INTEL_MSR_RANGE) !=
dprintk("Different control (%llu) and status values (%llu)\n", (p->states[i].status & INTEL_MSR_RANGE)) {
dprintk("Different MSR bits in control (%llu) and status (%llu)\n",
p->states[i].control, p->states[i].status); p->states[i].control, p->states[i].status);
result = -EINVAL; result = -EINVAL;
goto err_unreg; goto err_unreg;
@ -500,7 +502,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
} }
for (i=0; i<p->state_count; i++) { for (i=0; i<p->state_count; i++) {
centrino_model[cpu]->op_points[i].index = p->states[i].control; centrino_model[cpu]->op_points[i].index = p->states[i].control & INTEL_MSR_RANGE;
centrino_model[cpu]->op_points[i].frequency = p->states[i].core_frequency * 1000; centrino_model[cpu]->op_points[i].frequency = p->states[i].core_frequency * 1000;
dprintk("adding state %i with frequency %u and control value %04x\n", dprintk("adding state %i with frequency %u and control value %04x\n",
i, centrino_model[cpu]->op_points[i].frequency, centrino_model[cpu]->op_points[i].index); i, centrino_model[cpu]->op_points[i].frequency, centrino_model[cpu]->op_points[i].index);