acpi: Add IBM R60E laptop to proc-idle blacklist
PATCH 1/1 acpi: Add IBM R60E laptop to proc-idle blacklist
[UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.
Reference: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/38228
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commit;h=ce5e62bc55056049d192c422b6032f6a406e0ba2
---drivers/acpi/processor_idle.c | 3 +++
1 files changed, 3 insertions(+)
drivers/acpi/processor_idle.c +0 -0
@@ -142,6 +142,9 @@ static struct dmi_system_id __cpuinitdat
{ set_max_cstate, "IBM ThinkPad R40e", {
DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1},
+ { set_max_cstate, "IBM ThinkPad R40e", {
+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"),
+ DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1},
{ set_max_cstate, "Medion 41700", {
DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1},Quoted 14 lines · On Thu, 15 Jun 2006 13:00:43 -0700 Randy Dunlap <[email protected]> wrote:
[UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.
Reference: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/38228
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commit;h=ce5e62bc55056049d192c422b6032f6a406e0ba2Signed-off-by Ben Collins <[email protected]>--- drivers/acpi/processor_idle.c | 3 +++ 1 files changed, 3 insertions(+)
drivers/acpi/processor_idle.c static struct dmi_system_id __cpuinitdat · line 150
Quoted 9 lines
drivers/acpi/processor_idle.c +3
-0@@ -142,6 +142,9 @@ static struct dmi_system_id __cpuinitdat { set_max_cstate, "IBM ThinkPad R40e", {DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1}, + { set_max_cstate, "IBM ThinkPad R40e", { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), + DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1}, { set_max_cstate, "Medion 41700", {DMI_MATCH (DMI_BIOS_VENDOR ,"Phoenix Technologies LTD" ), DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1},
It seems that every R40e in the world is in that table.
Can/should we wildcard it? From my reading of dmi_check_system(), we can use "" in place of the "1SET..." string and it'll dtrt?
Quoted 10 lines · Andrew Morton
Review
Quoted 5 lines · On Thu, 15 Jun 2006 13:00:43 -0700 Randy Dunlap <[email protected]> wrote:
[UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.
(quoted diff) +3
-0+ { set_max_cstate, "IBM ThinkPad R40e", { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1},It seems that every R40e in the world is in that table.
The email says R60e.
The string says R40e.
Which is correct?
Signature · 3 lines
Ben Pfaff email: [email protected] web: http://benpfaff.org
Quoted 13 lines · On Mon, 19 Jun 2006 20:51:09 -0700 Ben Pfaff wrote:
Quoted 10 lines · Andrew Morton
Review
Quoted 5 lines · On Thu, 15 Jun 2006 13:00:43 -0700 Randy Dunlap <[email protected]> wrote:
[UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.
(quoted diff) +3
-0+ { set_max_cstate, "IBM ThinkPad R40e", { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1},It seems that every R40e in the world is in that table.
Quoted 3 lines
The email says R60e.
The string says R40e.
Which is correct?
Good question for Ben. Ben??
Current ubuntu-dapper git is still like this.
---
~Randy
Quoted 8 lines · Andrew Morton
Review
Quoted 3 lines
(quoted diff) +3
-0+ { set_max_cstate, "IBM ThinkPad R40e", { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1},It seems that every R40e in the world is in that table.
Can/should we wildcard it? From my reading of
dmi_check_system(), we can use "" in place of the "1SET..." string and it'll dtrt?
Wouldn't that result in every machine with "IBM" as the BIOS vendor having their maximum c-state limited?
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 3 lines · Ben Pfaff
The email says R60e.
The string says R40e.
Which is correct?
The string is correct. There is no R60e, to the best of my knowledge.
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 7 lines · Matthew Garrett
Quoted 6 lines · Andrew Morton
Review
Quoted 3 lines
(quoted diff) +3
-0+ { set_max_cstate, "IBM ThinkPad R40e", { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET70WW") }, (void*)1},It seems that every R40e in the world is in that table.
Quoted 5 lines
Quoted 2 lines
Can/should we wildcard it? From my reading of
dmi_check_system(), we can use "" in place of the "1SET..." string and it'll dtrt?Wouldn't that result in every machine with "IBM" as the BIOS vendor having their maximum c-state limited?
Yes. DMI_MATCH() specifies substring matching, so _if we knew_ that any BIOS version that began with "1SET4", "1SET5", "1SET6", or "1SET7" needed C-state limiting, the table could be made a lot smaller. But then it may need some exceptions, so just sticking with full version strings seems reasonable to me.
~Randy