Skip to contentSkip to conversation

hdaps add support for various IBM thinkpads R61/T61/T61P

PATCH In review maximilian attems 3 participants 6 messages Jun 13, 2008 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/hwmon/hdaps.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/hwmon/hdaps.c +3 -0
index 26df06f..e07c712 100644
@@ -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"),
Signature · 1 line
1.5.5.3
#1 lore raw
Quoted 25 lines · maximilian attems

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

---
 drivers/hwmon/hdaps.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/hwmon/hdaps.c +1 -0
index 26df06f..e07c712 100644
@@ -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"),

drivers/hwmon/hdaps.c static struct dmi_system_id __initdata hdaps_whitelist[] = { · line 528

Quoted 5 lines
drivers/hwmon/hdaps.c +2 -0
@@ -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.

Signature · 2 lines
Kind regards,
	Klaus S. Madsen
#2 lore raw
Quoted 24 lines · Klaus S. Madsen
Quoted 13 lines · maximilian attems
drivers/hwmon/hdaps.c +1 -0
index 26df06f..e07c712 100644
@@ -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"),

drivers/hwmon/hdaps.c static struct dmi_system_id __initdata hdaps_whitelist[] = { · line 528

Quoted 5 lines
drivers/hwmon/hdaps.c +2 -0
@@ -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.

Quoted 3 lines

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

Signature · 1 line
maks
#3 lore raw
Quoted 25 lines · maximilian attems
Quoted 24 lines · Klaus S. Madsen
Quoted 13 lines · maximilian attems
drivers/hwmon/hdaps.c +1 -0
index 26df06f..e07c712 100644
@@ -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"),

drivers/hwmon/hdaps.c static struct dmi_system_id __initdata hdaps_whitelist[] = { · line 528

Quoted 5 lines
drivers/hwmon/hdaps.c +2 -0
@@ -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.

Quoted 7 lines
Quoted 3 lines

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?

Signature · 2 lines
Kind regards,
	Klaus S. Madsen
#4 lore raw
Quoted 4 lines · Klaus S. Madsen

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.

Signature · 1 line
Jean Delvare
#5 lore raw
In reply to Klaus S. Madsen
Quoted 33 lines · Klaus S. Madsen
Quoted 25 lines · maximilian attems
Quoted 24 lines · Klaus S. Madsen
Quoted 13 lines · maximilian attems
drivers/hwmon/hdaps.c +1 -0
index 26df06f..e07c712 100644
@@ -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"),

drivers/hwmon/hdaps.c static struct dmi_system_id __initdata hdaps_whitelist[] = { · line 528

Quoted 5 lines
drivers/hwmon/hdaps.c +2 -0
@@ -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.

Quoted 7 lines
Quoted 3 lines

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?

Quoted 7 lines

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.

drivers/hwmon/hdaps.c +5 -0
index 26df06f..586e412 100644
@@ -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 }
 };