2008-06-13 11:27:29

by maximilian attems

Subject: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

last missing hdaps ubuntu sync.
add the ubuntu entries in alphabetical order.
original authors below on Cc.

Cc: Klaus S. Madsen <[email protected]>
Cc: Chuck Short <[email protected]>
Signed-off-by: Tim Gardner <[email protected]>
Signed-off-by: maximilian attems <[email protected]>
---
drivers/hwmon/hdaps.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 26df06f..e07c712 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -515,6 +515,7 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
+ HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R61"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
@@ -523,6 +524,8 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
+ HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61"),
+ HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61P"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
--
1.5.5.3

2008-06-13 12:07:42

by Klaus S. Madsen

Subject: Re: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

On Fri, Jun 13, 2008 at 13:26:47 +0200, maximilian attems wrote:
> last missing hdaps ubuntu sync.
> add the ubuntu entries in alphabetical order.
> original authors below on Cc.
>
> Cc: Klaus S. Madsen <[email protected]>
> Cc: Chuck Short <[email protected]>
> Signed-off-by: Tim Gardner <[email protected]>
> Signed-off-by: maximilian attems <[email protected]>
> ---
> drivers/hwmon/hdaps.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
> index 26df06f..e07c712 100644
> --- a/drivers/hwmon/hdaps.c
> +++ b/drivers/hwmon/hdaps.c
> @@ -515,6 +515,7 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
> HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
> HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
> + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R61"),
> HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
> HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
> HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
> @@ -523,6 +524,8 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
> HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
> HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
> + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61"),
> + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61P"),
I would suspect that this part of the patch is unnecessary. It would be
strange if there are any T61's where the manufacturer is IBM, instead of
LENOVO, since the T60 is older and has the manufacturer listed as
LENOVO, and no entry exists for IBM.

But according to the comment at the top of the struct, the second line
(the T61P part) is unnecessary, as a T61p already would be matched by
the T61 line.

--
Kind regards,
Klaus S. Madsen

2008-06-13 12:31:00

by maximilian attems

Subject: Re: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

On Fri, Jun 13, 2008 at 01:40:02PM +0200, Klaus S. Madsen wrote:
> On Fri, Jun 13, 2008 at 13:26:47 +0200, maximilian attems wrote:
> > diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
> > index 26df06f..e07c712 100644
> > --- a/drivers/hwmon/hdaps.c
> > +++ b/drivers/hwmon/hdaps.c
> > @@ -515,6 +515,7 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
> > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
> > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
> > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R61"),
> > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
> > HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
> > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
> > @@ -523,6 +524,8 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
> > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
> > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
> > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61"),
> > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61P"),
> I would suspect that this part of the patch is unnecessary. It would be
> strange if there are any T61's where the manufacturer is IBM, instead of
> LENOVO, since the T60 is older and has the manufacturer listed as
> LENOVO, and no entry exists for IBM.
>
> But according to the comment at the top of the struct, the second line
> (the T61P part) is unnecessary, as a T61p already would be matched by
> the T61 line.

according to hardy git there is no bug reference, but the T61p got added
before the T61 both by chuck. could you enlighten us please on the T61
IBM match need?

thanks

--
maks

2008-06-13 12:45:55

by Klaus S. Madsen

Subject: Re: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

On Fri, Jun 13, 2008 at 14:27:51 +0200, maximilian attems wrote:
> On Fri, Jun 13, 2008 at 01:40:02PM +0200, Klaus S. Madsen wrote:
> > On Fri, Jun 13, 2008 at 13:26:47 +0200, maximilian attems wrote:
> > > diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
> > > index 26df06f..e07c712 100644
> > > --- a/drivers/hwmon/hdaps.c
> > > +++ b/drivers/hwmon/hdaps.c
> > > @@ -515,6 +515,7 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
> > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
> > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
> > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R61"),
> > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
> > > HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
> > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
> > > @@ -523,6 +524,8 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
> > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
> > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
> > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61"),
> > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61P"),
> > I would suspect that this part of the patch is unnecessary. It would be
> > strange if there are any T61's where the manufacturer is IBM, instead of
> > LENOVO, since the T60 is older and has the manufacturer listed as
> > LENOVO, and no entry exists for IBM.
> >
> > But according to the comment at the top of the struct, the second line
> > (the T61P part) is unnecessary, as a T61p already would be matched by
> > the T61 line.
>
> according to hardy git there is no bug reference, but the T61p got added
> before the T61 both by chuck. could you enlighten us please on the T61
> IBM match need?
I believe that this patch is a response to
https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/133636

But as I stated in that bug description, the fix did not work for me.
Also both R61, T60, T61 and T61p owners responded that their
dmi-manufacturer was listed as LENOVO. So I'm quite dubious if these
entries will match any machines at all?

--
Kind regards,
Klaus S. Madsen

2008-06-13 13:22:13

by Jean Delvare

Subject: Re: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

On Fri, 13 Jun 2008 14:45:43 +0200, Klaus S. Madsen wrote:
> But as I stated in that bug description, the fix did not work for me.
> Also both R61, T60, T61 and T61p owners responded that their
> dmi-manufacturer was listed as LENOVO. So I'm quite dubious if these
> entries will match any machines at all?

FWIW, my T61p has LENOVO as the manufacturer in the DMI table, too.

--
Jean Delvare

2008-06-13 13:24:58

by maximilian attems

Subject: Re: [PATCH] hdaps add support for various IBM thinkpads R61/T61/T61P

On Fri, Jun 13, 2008 at 02:45:43PM +0200, Klaus S. Madsen wrote:
> On Fri, Jun 13, 2008 at 14:27:51 +0200, maximilian attems wrote:
> > On Fri, Jun 13, 2008 at 01:40:02PM +0200, Klaus S. Madsen wrote:
> > > On Fri, Jun 13, 2008 at 13:26:47 +0200, maximilian attems wrote:
> > > > diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
> > > > index 26df06f..e07c712 100644
> > > > --- a/drivers/hwmon/hdaps.c
> > > > +++ b/drivers/hwmon/hdaps.c
> > > > @@ -515,6 +515,7 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
> > > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
> > > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
> > > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R61"),
> > > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
> > > > HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
> > > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
> > > > @@ -523,6 +524,8 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
> > > > HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
> > > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
> > > > HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
> > > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61"),
> > > > + HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T61P"),
> > > I would suspect that this part of the patch is unnecessary. It would be
> > > strange if there are any T61's where the manufacturer is IBM, instead of
> > > LENOVO, since the T60 is older and has the manufacturer listed as
> > > LENOVO, and no entry exists for IBM.
> > >
> > > But according to the comment at the top of the struct, the second line
> > > (the T61P part) is unnecessary, as a T61p already would be matched by
> > > the T61 line.
> >
> > according to hardy git there is no bug reference, but the T61p got added
> > before the T61 both by chuck. could you enlighten us please on the T61
> > IBM match need?
> I believe that this patch is a response to
> https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/133636
>
> But as I stated in that bug description, the fix did not work for me.
> Also both R61, T60, T61 and T61p owners responded that their
> dmi-manufacturer was listed as LENOVO. So I'm quite dubious if these
> entries will match any machines at all?

ok thanks for fisching the reference,
launchpad is still quite an allien biest for me.

according to the bug report missing is R61, T61p, X61, Z61m, Z61p
will test belows on an X61.

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 26df06f..586e412 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -516,17 +516,22 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = {
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
+ HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"),
HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
+ HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
+ HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"),
HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
+ HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"),
+ HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"),
{ .ident = NULL }
};