acpi: Add list of IBM R40 laptops to processor_power dmi table.
PATCH 7/15 acpi: Add list of IBM R40 laptops to processor_power dmi table.
---
drivers/acpi/processor_idle.c | 67 +++++++++++++++++++++++++++++++---------- 1 files changed, 51 insertions(+), 16 deletions(-)
883292d0b65189123df24f335b5705f98da9a6ed
drivers/acpi/processor_idle.c +51 -16
@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_sys }static struct dmi_system_id __initdata processor_power_dmi_table[] = { - {set_max_cstate,"IBM ThinkPad R40e" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"IBM" ), -DMI_MATCH (DMI_BIOS_VERSION , -"1SET60WW" )}, - (void *)1 }, - {set_max_cstate,"Medion 41700" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"Phoenix Technologies LTD" ), -DMI_MATCH (DMI_BIOS_VERSION , -"R01-A1J" )}, (void *)1 }, - {set_max_cstate,"Clevo 5600D" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"Phoenix Technologies LTD" ), -DMI_MATCH (DMI_BIOS_VERSION , -"SHE845M0.86C.0013.D.0302131307" )}, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET60WW" )}, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET43WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET45WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET47WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET50WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET52WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET55WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET56WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET59WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET60WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET61WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET62WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET64WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET65WW" ) }, (void *)1 }, + { set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION ,"1SET68WW" ) }, (void *)1 }, + { set_max_cstate,"Medion 41700" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"Phoenix Technologies LTD" ), +DMI_MATCH (DMI_BIOS_VERSION ,"R01-A1J" )}, (void *)1 }, + { set_max_cstate,"Clevo 5600D" , { +DMI_MATCH (DMI_BIOS_VENDOR ,"Phoenix Technologies LTD" ), +DMI_MATCH (DMI_BIOS_VERSION ,"SHE845M0.86C.0013.D.0302131307" )}, (void *)2 }, {}, };
Signature · 1 line
1.0.5
Quoted 1 line · Ben Collins
Signed-off-by Ben Collins <[email protected]>
There's a variant of this in -mm already, (albeit with horked indentation) Does your diff have all the same entries that one does ?
(If so, I prefer yours :)
This is also being tracked at http://bugme.osdl.org/show_bug.cgi?id=3549
Len seemed to have an objection against merging this, but if every distro is carrying it anyway, it seems kinda pointless not to imo.
Dave
Quoted 7 lines · Dave Jones
Quoted 1 line · Ben Collins
Signed-off-by Ben Collins <[email protected]>There's a variant of this in -mm already, (albeit with horked indentation) Does your diff have all the same entries that one does ?
(If so, I prefer yours :)
Below.
Quoted 4 lines
This is also being tracked at http://bugme.osdl.org/show_bug.cgi?id=3549
Len seemed to have an objection against merging this, but if every distro is carrying it anyway, it seems kinda pointless not to imo.
I don't know what the problem is. I've been sitting on it since September and have sent it five times, to no effect.
From: Thomas Rosner <[email protected]>
This adds all known BIOS versions of IBM R40e Laptops to the C2/C3 processor state blacklist and thus prevents them from crashing. Fixes Bug #3549.
Implementation is probably overly verbose, but DMI_MATCH seems to give us no choice.
---
drivers/acpi/processor_idle.c | 115 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 101 insertions(+), 14 deletions(-)
drivers/acpi/processor_idle.c renamed from drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 +101 -14
@@ -95,23 +95,110 @@ static int set_max_cstate(struct dmi_sys }static struct dmi_system_id __initdata processor_power_dmi_table[] = { +/* The known versions of IBM R40e BIOS */ {set_max_cstate,"IBM ThinkPad R40e" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"IBM" ), -DMI_MATCH (DMI_BIOS_VERSION , -"1SET60WW" )}, - (void *)1 }, +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET32WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET43WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET45WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET47WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET50WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET52WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET55WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET56WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET59WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET60WW" )}, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET61WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET62WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET64WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET65WW" ) }, + (void *)1 }, + {set_max_cstate,"IBM ThinkPad R40e" , { +DMI_MATCH (DMI_BIOS_VENDOR , +"IBM" ), +DMI_MATCH (DMI_BIOS_VERSION , +"1SET68WW" ) }, + (void *)1 }, +/* Other laptops, same problem */ {set_max_cstate,"Medion 41700" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"Phoenix Technologies LTD" ), -DMI_MATCH (DMI_BIOS_VERSION , -"R01-A1J" )}, (void *)1 }, +DMI_MATCH (DMI_BIOS_VENDOR , +"Phoenix Technologies LTD" ), +DMI_MATCH (DMI_BIOS_VERSION , +"R01-A1J" )}, + (void *)1 }, {set_max_cstate,"Clevo 5600D" , { -DMI_MATCH (DMI_BIOS_VENDOR , -"Phoenix Technologies LTD" ), -DMI_MATCH (DMI_BIOS_VERSION , -"SHE845M0.86C.0013.D.0302131307" )}, - (void *)2 }, +DMI_MATCH (DMI_BIOS_VENDOR , +"Phoenix Technologies LTD" ), +DMI_MATCH (DMI_BIOS_VERSION , +"SHE845M0.86C.0013.D.0302131307" )}, + (void *)2 }, {}, };
_
Quoted 10 lines · Andrew Morton
Quoted 7 lines · Dave Jones
Quoted 1 line · Ben Collins
Signed-off-by Ben Collins <[email protected]>There's a variant of this in -mm already, (albeit with horked indentation) Does your diff have all the same entries that one does ?
(If so, I prefer yours :)Below.
Ok. The IDs seem to be the same. I'd vote to drop the -mm one and go with Ben's variant which fixes the lindent trainwreck at the same time.
Dave
Quoted 7 lines · Dave Jones
Quoted 5 lines · Andrew Morton
Quoted 4 lines · Dave Jones
Quoted 1 line · Ben Collins
Signed-off-by Ben Collins <[email protected]>
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
There's a variant of this in -mm already, (albeit with horked indentation) Does your diff have all the same entries that one does ?
(If so, I prefer yours :)Below.
Ok. The IDs seem to be the same. I'd vote to drop the -mm one and go with Ben's variant which fixes the lindent trainwreck at the same time.
OK. But I'll keep the attributions as I had them, under the assumption that they're more accurate than Ben's (which appear to be not at all ;))