[Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Randy Dunlap]

[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

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
---
 drivers/acpi/processor_idle.c |    3 +++
 1 files changed, 3 insertions(+)

--- linux-2617-rc6g7.orig/drivers/acpi/processor_idle.c
+++ linux-2617-rc6g7/drivers/acpi/processor_idle.c
@@ -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},

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Andrew Morton]

On Thu, 15 Jun 2006 13:00:43 -0700
Randy Dunlap <randy.dunlap@oracle.com> 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=ce5e62bc55056049d192c422b6032f6a406e0ba2
> 
> Signed-off-by: Ben Collins <bcollins@ubuntu.com>
> ---
>  drivers/acpi/processor_idle.c |    3 +++
>  1 files changed, 3 insertions(+)
> 
> --- linux-2617-rc6g7.orig/drivers/acpi/processor_idle.c
> +++ linux-2617-rc6g7/drivers/acpi/processor_idle.c
> @@ -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?

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Ben Pfaff]

Andrew Morton <akpm@osdl.org> writes:

> On Thu, 15 Jun 2006 13:00:43 -0700
> Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
>> [UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.

>> +	{ 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?
-- 
Ben Pfaff 
email: blp@cs.stanford.edu
web: http://benpfaff.org

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Randy.Dunlap]

On Mon, 19 Jun 2006 20:51:09 -0700 Ben Pfaff wrote:

> Andrew Morton <akpm@osdl.org> writes:
> 
> > On Thu, 15 Jun 2006 13:00:43 -0700
> > Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >
> >> [UBUNTU:acpi] Add IBM R60E laptop to proc-idle blacklist.
> 
> >> +	{ 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?

Good question for Ben.  Ben??

Current ubuntu-dapper git is still like this.

---
~Randy

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Matthew Garrett]

On Mon, Jun 19, 2006 at 08:51:09PM -0700, Ben Pfaff wrote:

> 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.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Matthew Garrett]

On Mon, Jun 19, 2006 at 08:33:33PM -0700, Andrew Morton wrote:
> > +	{ 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?
-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [Ubuntu PATCH] acpi: Add IBM R60E laptop to proc-idle blacklist

[Randy Dunlap]

Matthew Garrett wrote:
> On Mon, Jun 19, 2006 at 08:33:33PM -0700, Andrew Morton wrote:
>>> +	{ 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?

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