speedstep-centrino should ignore upper performance control bits
PATCH 1/1 speedstep-centrino should ignore upper performance control bits
On some systems such as the IBM x3650 there are bits set in the upper half of the control values 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 fails even though the ACPI spec allows the inequality.
---
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.orig +4 -0
@@ -463,6 +463,10 @@ }for (i=0 ; i<p->state_count; i++) { +/* clear high bits (set by some BIOSes) that are non-relevant and +problematic for this driver's MSR only frequency transition code */ + p->states[i].control &=0xffff ; +if (p->states[i].control != p->states[i].status) {dprintk ("Different control (%llu) and status values (%llu)\n" , p->states[i].control, p->states[i].status);
Quoted 5 lines · Gary Hade
On some systems such as the IBM x3650 there are bits set in the upper half of the control values provided by the
_PSSobject. These bits are only relevant for cpufreq drivers that use IO ports which are not currently supported by the speedstep-centrino driver.
... and probably never will.
Quoted 4 lines
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 fails even though the ACPI spec allows the inequality.
How does the acpi-cpufreq driver work with it?
Thanks,
Dominik
Quoted 6 lines · Dominik Brodowski
Quoted 5 lines · Gary Hade
On some systems such as the IBM x3650 there are bits set in the upper half of the control values provided by the
_PSSobject. These bits are only relevant for cpufreq drivers that use IO ports which are not currently supported by the speedstep-centrino driver.
Quoted 8 lines
... and probably never will.
Quoted 4 lines
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 fails even though the ACPI spec allows the inequality.
How does the acpi-cpufreq driver work with it?
acpu-cpufreq.c in Linus' tree is still IO only.
acpi-cpufreq. in Dave's tree changed to do this:
where #define INTEL_MSR_RANGE (0xffff)
- cmd.addr.port = perf->control_register.address;
- cmd.addr.bit_width = perf->control_register.bit_width;
- cmd.val = (u32) perf->states[next_perf_state].control;
+ switch (data->cpu_feature) {
+ case SYSTEM_INTEL_MSR_CAPABLE:
+ cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
+ cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
+ msr = (u32) perf->states[next_perf_state].control & INTEL_MSR_RANGE;
+ cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
+ break;
+ case SYSTEM_IO_CAPABLE:
+ cmd.type = SYSTEM_IO_CAPABLE;
+ cmd.addr.io.port = perf->control_register.address;
+ cmd.addr.io.bit_width = perf->control_register.bit_width;
+ cmd.val = (u32) perf->states[next_perf_state].control;
+ break;Quoted 9 lines · Len Brown
Quoted 8 lines · Dominik Brodowski
Quoted 5 lines · Gary Hade
On some systems such as the IBM x3650 there are bits set in the upper half of the control values provided by the
_PSSobject. These bits are only relevant for cpufreq drivers that use IO ports which are not currently supported by the speedstep-centrino driver.... and probably never will.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
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 fails even though the ACPI spec allows the inequality.
How does the acpi-cpufreq driver work with it?
acpu-cpufreq.cin Linus' tree is still IO only.
True. On the x3650 this version of acpi-cpufreq fails to load with a "No such device" error after debug message complaints about lack of ACPI_ADR_SPACE_FIXED_HARDWARE address space support.
...
cpufreq-core: adding CPU 0
acpi-cpufreq: acpi_cpufreq_cpu_init
acpi-cpufreq: Unsupported address space [127, 127]
cpufreq-core: initialization failed
...This problem is resolved in the later version mentioned below.
Quoted 9 lines
acpi-cpufreq. in Dave's tree changed to do this:
where #defineINTEL_MSR_RANGE(0xffff)(quoted diff) +3
-3- cmd.addr.port = perf->control_register.address; - cmd.addr.bit_width = perf->control_register.bit_width; - cmd.val = (u32) perf->states[next_perf_state].control; + switch (data->cpu_feature) { + case SYSTEM_INTEL_MSR_CAPABLE: + cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
Review
Quoted 10 lines
(quoted diff) +10
-0+ cmd.addr.msr.reg = MSR_IA32_PERF_CTL; + msr = (u32) perf->states[next_perf_state].control & INTEL_MSR_RANGE; + cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr; + break; + case SYSTEM_IO_CAPABLE: + cmd.type = SYSTEM_IO_CAPABLE; + cmd.addr.io.port = perf->control_register.address; + cmd.addr.io.bit_width = perf->control_register.bit_width; + cmd.val = (u32) perf->states[next_perf_state].control; + break;
The acpi-cpufreq in 2.6.19-rc4-mm2 which contains these changes appears to work fine on the x3650.
Gary
Signature · 5 lines
Gary Hade IBM Linux Technology Center 503-578-4503 IBM T/L: 775-4503 [email protected] http://www.ibm.com/linux/ltc
Quoted 22 lines · Gary Hade
Quoted 9 lines · Len Brown
Quoted 8 lines · Dominik Brodowski
Quoted 5 lines · Gary Hade
On some systems such as the IBM x3650 there are bits set in the upper half of the control values provided by the
_PSSobject. These bits are only relevant for cpufreq drivers that use IO ports which are not currently supported by the speedstep-centrino driver.... and probably never will.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
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 fails even though the ACPI spec allows the inequality.
How does the acpi-cpufreq driver work with it?
acpu-cpufreq.cin Linus' tree is still IO only.True. On the x3650 this version of acpi-cpufreq fails to load with a "No such device" error after debug message complaints about lack of
ACPI_ADR_SPACE_FIXED_HARDWAREaddress space support.
Quoted 6 lines
...
cpufreq-core: adding CPU 0
acpi-cpufreq: acpi_cpufreq_cpu_init
acpi-cpufreq: Unsupported address space [127, 127]
cpufreq-core: initialization failed
...The above result was obtained with Woodcrest processors installed in the system. With Dempsey processors the address space is ACPI_ADR_SPACE_SYSTEM_IO and the 2.6.19-rc4 version of acpi-cpufreq loads and functions correctly.
The patch I provided modifies the in-kernel copy of the ACPI data which is the wrong thing to do. I will post an improved patch as soon as the Woodcrests are reinstalled and I am able to test it.
Thanks,
Gary
Signature · 5 lines
Gary Hade IBM Linux Technology Center 503-578-4503 IBM T/L: 775-4503 [email protected] http://www.ibm.com/linux/ltc
Quoted 9 lines · Gary Hade
The above result was obtained with Woodcrest processors installed in the system. With Dempsey processors the address space is
ACPI_ADR_SPACE_SYSTEM_IOand the 2.6.19-rc4 version of acpi-cpufreq loads and functions correctly.The patch I provided modifies the in-kernel copy of the ACPI data which is the wrong thing to do. I will post an improved patch as soon as the Woodcrests are reinstalled and I am able to test it.
Argh. I sat on the fence on this one until the dest settled, and now, as soon as I merge it, this happens. Bah!
Send an incremental against cpufreq.git so I don't have to reconstruct the whole git tree? Or is the right change completely different, causing a complete revert of this?
Dave
Signature · 1 line
http://www.codemonkey.org.uk
Quoted 7 lines · Dave Jones
Quoted 5 lines · Gary Hade
The above result was obtained with Woodcrest processors installed in the system. With Dempsey processors the address space is
ACPI_ADR_SPACE_SYSTEM_IOand the 2.6.19-rc4 version of acpi-cpufreq loads and functions correctly.
Quoted 7 lines
Quoted 4 lines
The patch I provided modifies the in-kernel copy of the ACPI data which is the wrong thing to do. I will post an improved patch as soon as the Woodcrests are reinstalled and I am able to test it.
Argh. I sat on the fence on this one until the dest settled, and now, as soon as I merge it, this happens. Bah!
Dave, I'm sorry. I just discovered the problem. :(
Quoted 3 lines
Send an incremental against cpufreq.git so I don't have to reconstruct the whole git tree?
Okay, I'll try to figure out how to do that.
Quoted 2 lines
Or is the right change completely
different, causing a complete revert of this?
The change will completely remove the lines of codes added by the first patch and revise other existing lines of code.
Gary
Signature · 5 lines
Gary Hade IBM Linux Technology Center 503-578-4503 IBM T/L: 775-4503 [email protected] http://www.ibm.com/linux/ltc
Quoted 3 lines · Gary Hade
Quoted 2 lines
Argh. I sat on the fence on this one until the dest settled, and now, as soon as I merge it, this happens. Bah!
Dave, I'm sorry. I just discovered the problem. :(
Ok, I just tried to reconstruct my git tree without that diff and hit problems trying to get the older patches applying against a current tree, so I don't want to go down the route of making everyone rediff and resend the 20 or so patches already queued. However..
Quoted 3 lines
Quoted 2 lines
Send an incremental against cpufreq.git so I don't have to reconstruct the whole git tree?
Okay, I'll try to figure out how to do that.
git revert has nuked the change, but leaves a mess in the commits, but I think we can live with that. So just send the right fix, and we'll make like this never happened :-)
Dave
Signature · 1 line
http://www.codemonkey.org.uk
Quoted 12 lines · Dave Jones
Quoted 3 lines · Gary Hade
Quoted 2 lines
Argh. I sat on the fence on this one until the dest settled, and now, as soon as I merge it, this happens. Bah!
Dave, I'm sorry. I just discovered the problem. :(
Ok, I just tried to reconstruct my git tree without that diff and hit problems trying to get the older patches applying against a current tree, so I don't want to go down the route of making everyone rediff and resend the 20 or so patches already queued. However..
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
Send an incremental against cpufreq.git so I don't have to reconstruct the whole git tree?
Okay, I'll try to figure out how to do that.
git revert has nuked the change, but leaves a mess in the commits, but I think we can live with that. So just send the right fix, and we'll make like this never happened :-)
Dave, I apologize again for the trouble. Improved patch which does essentially the same thing but avoids modifying the in-kernel ACPI data is included below.
Thanks!
Gary
Signature · 49 lines
Gary Hade IBM Linux Technology Center 503-578-4503 IBM T/L: 775-4503 [email protected] http://www.ibm.com/linux/ltc 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 <[email protected]> --- linux-2.6.19-rc5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.orig 2006-11-07 18:24:20.000000000 -0800 +++ linux-2.6.19-rc5/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-11-10 09:02:29.000000000 -0800 @@ -36,6 +36,7 @@ #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg) +#define INTEL_MSR_RANGE (0xffff) struct cpu_id { @@ -463,8 +464,9 @@ static int centrino_cpu_init_acpi(struct } for (i=0; i<p->state_count; i++) { - if (p->states[i].control != p->states[i].status) { - dprintk("Different control (%llu) and status values (%llu)\n", + if ((p->states[i].control & INTEL_MSR_RANGE) != + (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); result = -EINVAL; goto err_unreg; @@ -500,7 +502,7 @@ static int centrino_cpu_init_acpi(struct } 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; 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);
Quoted 11 lines · Gary Hade
On some systems such as the IBM x3650 there are bits set in the upper half of the control values provided by the
_PSSobject. 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 fails even though the ACPI spec allows the inequality.Signed-off-by Gary Hade <[email protected]>
Sorry, incorrect email address. This should be
Gary
Signature · 5 lines
Gary Hade IBM Linux Technology Center 503-578-4503 IBM T/L: 775-4503 [email protected] http://www.ibm.com/linux/ltc