patch : hdaps on Thinkpad R52

patch : hdaps on Thinkpad R52

[Frank Gevaerts]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

Hello,

I had to add a new entry to the hdaps_whitelist table in hdaps.c to get
my Thinkpad R52 recognized. Patch is attached

Frank


-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

[-- Attachment #2: hdaps-r52.patch --]
[-- Type: text/plain, Size: 564 bytes --]

diff -ur linux-2.6.16-rc4/drivers/hwmon/hdaps.c linux-2.6.16-rc4-fg/drivers/hwmon/hdaps.c
--- linux-2.6.16-rc4/drivers/hwmon/hdaps.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.16-rc4-fg/drivers/hwmon/hdaps.c	2006-02-24 13:25:53.000000000 +0100
@@ -515,6 +515,7 @@
 
 	/* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
 	struct dmi_system_id hdaps_whitelist[] = {
+		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
 		HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),

Re: patch : hdaps on Thinkpad R52

[Adrian Bunk]

On Tue, Mar 14, 2006 at 09:57:58PM +0100, Frank Gevaerts wrote:

> Hello,

Hi Frank,

> I had to add a new entry to the hdaps_whitelist table in hdaps.c to get
> my Thinkpad R52 recognized. Patch is attached

please resend your patch:
- inline in the email (not an attachment) and
- with a Signed-off-by: line

> Frank

TIA
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: patch : hdaps on Thinkpad R52

[Arkadiusz Miskiewicz]

On Saturday 25 March 2006 22:09, you wrote:
> On Tue, Mar 14, 2006 at 09:57:58PM +0100, Frank Gevaerts wrote:
> > Hello,
>
> Hi Frank,
>
> > I had to add a new entry to the hdaps_whitelist table in hdaps.c to get
> > my Thinkpad R52 recognized. Patch is attached
>
> please resend your patch:
> - inline in the email (not an attachment) and
> - with a Signed-off-by: line

Here is a patch for Z60m. hdaps seems working fine - pivot utility reports values
that match description by R. Love sent to this ml few months ago.

Signed-off-by: Arkadiusz Miskiewicz <arekm@pld-linux.org>

--- linux-2.6.16/drivers/hwmon/hdaps.c.org	2006-03-26 00:30:53.000000000 +0100
+++ linux-2.6.16/drivers/hwmon/hdaps.c	2006-03-26 00:31:30.000000000 +0100
@@ -528,6 +528,7 @@
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
+		HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),
 		{ .ident = NULL }
 	};
 

>
> > Frank
>
> TIA
> Adrian

-- 
Arkadiusz Miśkiewicz                    PLD/Linux Team
http://www.t17.ds.pwr.wroc.pl/~misiek/  http://ftp.pld-linux.org/

Re: patch : hdaps on Thinkpad R52

[Jean Delvare]

Hi Frank,

> I had to add a new entry to the hdaps_whitelist table in hdaps.c to get
> my Thinkpad R52 recognized. Patch is attached
> (...)
>  	/* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
>  	struct dmi_system_id hdaps_whitelist[] = {
> +		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
>  		HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
>  		HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
>  		HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),

I have some doubt about this. The Thinkpad R52 is already supported
(with identifier string "ThinkPad R52", unsuprisingly) and "ThinkPad H"
doesn't exactly sound sane. Looks like your DMI data is corrupted or
something. Could you please provide the output of dmidecode and
vpddecode on your laptop?

Anyone else with a Thinkpad R52 can provide the same information for
comparison?

Feel free to send the outputs to me privately if you don't want to make
them public.

Thanks,
-- 
Jean Delvare

Re: patch : hdaps on Thinkpad R52

[Jean Delvare]

Hi Arkadiusz,

> Here is a patch for Z60m. hdaps seems working fine - pivot utility reports values
> that match description by R. Love sent to this ml few months ago.
> 
> Signed-off-by: Arkadiusz Miskiewicz <arekm@pld-linux.org>
> 
> --- linux-2.6.16/drivers/hwmon/hdaps.c.org	2006-03-26 00:30:53.000000000 +0100
> +++ linux-2.6.16/drivers/hwmon/hdaps.c	2006-03-26 00:31:30.000000000 +0100
> @@ -528,6 +528,7 @@
>  		HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),
>  		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),
>  		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
> +		HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),
>  		{ .ident = NULL }
>  	};

OK, I grabbed this, and will merge it into another patch altering the
same device list.

Thanks,
-- 
Jean Delvare

Re: patch : hdaps on Thinkpad R52

[Frank Gevaerts]

[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]

On Tue, Mar 28, 2006 at 06:29:33PM +0200, Jean Delvare wrote:
> Hi Frank,
> 
> > I had to add a new entry to the hdaps_whitelist table in hdaps.c to get
> > my Thinkpad R52 recognized. Patch is attached
> > (...)
> >  	/* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
> >  	struct dmi_system_id hdaps_whitelist[] = {
> > +		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
> >  		HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
> >  		HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
> >  		HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),
> 
> I have some doubt about this. The Thinkpad R52 is already supported
> (with identifier string "ThinkPad R52", unsuprisingly) and "ThinkPad H"
> doesn't exactly sound sane. Looks like your DMI data is corrupted or
> something. Could you please provide the output of dmidecode and
> vpddecode on your laptop?

They are attached.

Frank

> Anyone else with a Thinkpad R52 can provide the same information for
> comparison?
> 
> Feel free to send the outputs to me privately if you don't want to make
> them public.
> 
> Thanks,
> -- 
> Jean Delvare

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

[-- Attachment #2: dmidecode.out --]
[-- Type: text/plain, Size: 13180 bytes --]

# dmidecode 2.8
SMBIOS 2.33 present.
64 structures occupying 2087 bytes.
Table at 0x000E0010.

Handle 0x0000, DMI type 0, 20 bytes
BIOS Information
	Vendor: IBM
	Version: 76ET58WW (1.18 )
	Release Date: 07/19/2005
	Address: 0xDC000
	Runtime Size: 144 kB
	ROM Size: 1024 kB
	Characteristics:
		PCI is supported
		PC Card (PCMCIA) is supported
		PNP is supported
		APM is supported
		BIOS is upgradeable
		BIOS shadowing is allowed
		ESCD support is available
		Boot from CD is supported
		Selectable boot is supported
		EDD is supported
		3.5"/720 KB floppy services are supported (int 13h)
		Print screen service is supported (int 5h)
		8042 keyboard services are supported (int 9h)
		Serial services are supported (int 14h)
		Printer services are supported (int 17h)
		CGA/mono video services are supported (int 10h)
		ACPI is supported
		USB legacy is supported
		BIOS boot specification is supported

Handle 0x0001, DMI type 1, 25 bytes
System Information
	Manufacturer: IBM
	Product Name: 1846AQG
	Version: ThinkPad H   
	Serial Number: L3BNV57
	UUID: 440FDA01-47EA-11CB-ACDC-CCB11CAFAF85
	Wake-up Type: Power Switch

Handle 0x0002, DMI type 2, 8 bytes
Base Board Information
	Manufacturer: IBM
	Product Name: 1846AQG
	Version: Not Available
	Serial Number: 1ZB0C5C645Y

Handle 0x0003, DMI type 3, 17 bytes
Chassis Information
	Manufacturer: IBM
	Type: Notebook
	Lock: Not Present
	Version: Not Available
	Serial Number: Not Available
	Asset Tag: No Asset Information
	Boot-up State: Unknown
	Power Supply State: Unknown
	Thermal State: Unknown
	Security Status: Unknown
	OEM Information: 0x00000000

Handle 0x0004, DMI type 126, 17 bytes
Inactive

Handle 0x0005, DMI type 126, 17 bytes
Inactive

Handle 0x0006, DMI type 4, 35 bytes
Processor Information
	Socket Designation: None
	Type: Central Processor
	Family: Pentium M
	Manufacturer: GenuineIntel
	ID: D8 06 00 00 FF FB E9 AF
	Signature: Type 0, Family 6, Model 13, Stepping 8
	Flags:
		FPU (Floating-point unit on-chip)
		VME (Virtual mode extension)
		DE (Debugging extension)
		PSE (Page size extension)
		TSC (Time stamp counter)
		MSR (Model specific registers)
		PAE (Physical address extension)
		MCE (Machine check exception)
		CX8 (CMPXCHG8 instruction supported)
		APIC (On-chip APIC hardware supported)
		SEP (Fast system call)
		MTRR (Memory type range registers)
		PGE (Page global enable)
		MCA (Machine check architecture)
		CMOV (Conditional move instruction supported)
		PAT (Page attribute table)
		CLFSH (CLFLUSH instruction supported)
		DS (Debug store)
		ACPI (ACPI supported)
		MMX (MMX technology supported)
		FXSR (Fast floating-point save and restore)
		SSE (Streaming SIMD extensions)
		SSE2 (Streaming SIMD extensions 2)
		SS (Self-snoop)
		TM (Thermal monitor supported)
		PBE (Pending break enabled)
	Version: Intel(R) Pentium(R) M processor
	Voltage: 1.3 V
	External Clock: 533 MHz
	Max Speed: 1866 MHz
	Current Speed: 1866 MHz
	Status: Populated, Enabled
	Upgrade: None
	L1 Cache Handle: 0x000A
	L2 Cache Handle: 0x000B
	L3 Cache Handle: Not Provided
	Serial Number: Not Specified
	Asset Tag: Not Specified
	Part Number: Not Specified

Handle 0x0007, DMI type 5, 20 bytes
Memory Controller Information
	Error Detecting Method: None
	Error Correcting Capabilities:
		None
	Supported Interleave: One-way Interleave
	Current Interleave: One-way Interleave
	Maximum Memory Module Size: 1024 MB
	Maximum Total Memory Size: 2048 MB
	Supported Speeds:
		Other
	Supported Memory Types:
		DIMM
		SDRAM
	Memory Module Voltage: 2.9 V
	Associated Memory Slots: 2
		0x0008
		0x0009
	Enabled Error Correcting Capabilities:
		Unknown

Handle 0x0008, DMI type 6, 12 bytes
Memory Module Information
	Socket Designation: DIMM Slot 1
	Bank Connections: 0 3
	Current Speed: Unknown
	Type: DIMM SDRAM
	Installed Size: 512 MB (Double-bank Connection)
	Enabled Size: 512 MB (Double-bank Connection)
	Error Status: OK

Handle 0x0009, DMI type 6, 12 bytes
Memory Module Information
	Socket Designation: DIMM Slot 2
	Bank Connections: 4 7
	Current Speed: Unknown
	Type: DIMM SDRAM
	Installed Size: Not Installed
	Enabled Size: Not Installed
	Error Status: OK

Handle 0x000A, DMI type 7, 19 bytes
Cache Information
	Socket Designation: Internal L1 Cache
	Configuration: Enabled, Socketed, Level 1
	Operational Mode: Write Back
	Location: Internal
	Installed Size: 32 KB
	Maximum Size: 32 KB
	Supported SRAM Types:
		Synchronous
	Installed SRAM Type: Synchronous
	Speed: Unknown
	Error Correction Type: Single-bit ECC
	System Type: Data
	Associativity: 8-way Set-associative

Handle 0x000B, DMI type 7, 19 bytes
Cache Information
	Socket Designation: Internal L2 Cache
	Configuration: Enabled, Socketed, Level 2
	Operational Mode: Write Back
	Location: Internal
	Installed Size: 2048 KB
	Maximum Size: 2048 KB
	Supported SRAM Types:
		Burst
	Installed SRAM Type: Burst
	Speed: Unknown
	Error Correction Type: Multi-bit ECC
	System Type: Unified
	Associativity: 8-way Set-associative

Handle 0x000C, DMI type 126, 9 bytes
Inactive

Handle 0x000D, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Infrared
	External Connector Type: Infrared
	Port Type: Other

Handle 0x000E, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Parallel
	External Connector Type: DB-25 female
	Port Type: Parallel Port ECP/EPP

Handle 0x000F, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: External Monitor
	External Connector Type: DB-15 female
	Port Type: Video Port

Handle 0x0010, DMI type 126, 9 bytes
Inactive

Handle 0x0011, DMI type 126, 9 bytes
Inactive

Handle 0x0012, DMI type 126, 9 bytes
Inactive

Handle 0x0013, DMI type 126, 9 bytes
Inactive

Handle 0x0014, DMI type 126, 9 bytes
Inactive

Handle 0x0015, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Microphone Jack
	External Connector Type: Mini Jack (headphones)
	Port Type: Audio Port

Handle 0x0016, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Headphone Jack
	External Connector Type: Mini Jack (headphones)
	Port Type: Audio Port

Handle 0x0017, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: S-Video-Out
	External Connector Type: Other
	Port Type: Video Port

Handle 0x0018, DMI type 126, 9 bytes
Inactive

Handle 0x0019, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Modem
	External Connector Type: RJ-11
	Port Type: Modem Port

Handle 0x001A, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: Ethernet
	External Connector Type: RJ-45
	Port Type: Network Port

Handle 0x001B, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: USB 1
	External Connector Type: Access Bus (USB)
	Port Type: USB

Handle 0x001C, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: USB 2
	External Connector Type: Access Bus (USB)
	Port Type: USB

Handle 0x001D, DMI type 126, 9 bytes
Inactive

Handle 0x001E, DMI type 126, 9 bytes
Inactive

Handle 0x001F, DMI type 126, 9 bytes
Inactive

Handle 0x0020, DMI type 126, 9 bytes
Inactive

Handle 0x0021, DMI type 8, 9 bytes
Port Connector Information
	Internal Reference Designator: Not Available
	Internal Connector Type: None
	External Reference Designator: IEEE1394
	External Connector Type: IEEE 1394
	Port Type: Firewire (IEEE P1394)

Handle 0x0022, DMI type 9, 13 bytes
System Slot Information
	Designation: CardBus Slot 1
	Type: 32-bit PC Card (PCMCIA)
	Current Usage: Available
	Length: Other
	ID: Adapter 0, Socket 0
	Characteristics:
		5.0 V is provided
		3.3 V is provided
		PC Card-16 is supported
		Cardbus is supported
		Zoom Video is supported
		Modem ring resume is supported
		PME signal is supported
		Hot-plug devices are supported

Handle 0x0023, DMI type 126, 13 bytes
Inactive

Handle 0x0024, DMI type 126, 13 bytes
Inactive

Handle 0x0025, DMI type 126, 13 bytes
Inactive

Handle 0x0026, DMI type 9, 13 bytes
System Slot Information
	Designation: Mini-PCI Slot 1
	Type: 32-bit PCI
	Current Usage: Available
	Length: Other
	ID: 1
	Characteristics:
		5.0 V is provided
		3.3 V is provided
		PME signal is supported
		SMBus signal is supported

Handle 0x0027, DMI type 126, 13 bytes
Inactive

Handle 0x0028, DMI type 10, 6 bytes
On Board Device Information
	Type: Other
	Status: Disabled
	Description: IBM Embedded Security hardware

Handle 0x0029, DMI type 11, 5 bytes
OEM Strings
	String 1: IBM ThinkPad Embedded Controller -[76HT14WW-1.04    ]-

Handle 0x002A, DMI type 13, 22 bytes
BIOS Language Information
	Installable Languages: 1
		enUS
	Currently Installed Language: enUS

Handle 0x002B, DMI type 15, 25 bytes
System Event Log
	Area Length: 0 bytes
	Header Start Offset: 0x0000
	Header Length: 16 bytes
	Data Start Offset: 0x0010
	Access Method: General-purpose non-volatile data functions
	Access Address: 0x0000
	Status: Invalid, Not Full
	Change Token: 0x00000000
	Header Format: Type 1
	Supported Log Type Descriptors: 1
	Descriptor 1: POST error
	Data Format 1: POST results bitmap

Handle 0x002C, DMI type 16, 15 bytes
Physical Memory Array
	Location: System Board Or Motherboard
	Use: System Memory
	Error Correction Type: None
	Maximum Capacity: 1 GB
	Error Information Handle: Not Provided
	Number Of Devices: 2

Handle 0x002D, DMI type 17, 27 bytes
Memory Device
	Array Handle: 0x002C
	Error Information Handle: No Error
	Total Width: 64 bits
	Data Width: 64 bits
	Size: 512 MB
	Form Factor: SODIMM
	Set: None
	Locator: DIMM 1
	Bank Locator: Bank 0/1
	Type: DDR
	Type Detail: Synchronous
	Speed: Unknown
	Manufacturer: Not Specified
	Serial Number: Not Specified
	Asset Tag: Not Specified
	Part Number: Not Specified

Handle 0x002E, DMI type 17, 27 bytes
Memory Device
	Array Handle: 0x002C
	Error Information Handle: No Error
	Total Width: Unknown
	Data Width: Unknown
	Size: No Module Installed
	Form Factor: SODIMM
	Set: None
	Locator: DIMM 2
	Bank Locator: Bank 2/3
	Type: DDR
	Type Detail: Synchronous
	Speed: Unknown
	Manufacturer: Not Specified
	Serial Number: Not Specified
	Asset Tag: Not Specified
	Part Number: Not Specified

Handle 0x002F, DMI type 18, 23 bytes
32-bit Memory Error Information
	Type: OK
	Granularity: Unknown
	Operation: Unknown
	Vendor Syndrome: Unknown
	Memory Array Address: Unknown
	Device Address: Unknown
	Resolution: Unknown

Handle 0x0030, DMI type 19, 15 bytes
Memory Array Mapped Address
	Starting Address: 0x00000000000
	Ending Address: 0x0001FFFFFFF
	Range Size: 512 MB
	Physical Array Handle: 0x002C
	Partition Width: 0

Handle 0x0031, DMI type 20, 19 bytes
Memory Device Mapped Address
	Starting Address: 0x00000000000
	Ending Address: 0x0001FFFFFFF
	Range Size: 512 MB
	Physical Device Handle: 0x002D
	Memory Array Mapped Address Handle: 0x0030
	Partition Row Position: 1

Handle 0x0032, DMI type 126, 19 bytes
Inactive

Handle 0x0033, DMI type 21, 7 bytes
Built-in Pointing Device
	Type: Track Point
	Interface: PS/2
	Buttons: 3

Handle 0x0034, DMI type 21, 7 bytes
Built-in Pointing Device
	Type: Touch Pad
	Interface: PS/2
	Buttons: 0

Handle 0x0035, DMI type 24, 5 bytes
Hardware Security
	Power-On Password Status: Disabled
	Keyboard Password Status: Disabled
	Administrator Password Status: Disabled
	Front Panel Reset Status: Unknown

Handle 0x0036, DMI type 32, 11 bytes
System Boot Information
	Status: No errors detected

Handle 0x0037, DMI type 131, 17 bytes
OEM-specific Type
	Header and Data:
		83 11 37 00 01 02 03 FF FF 1F 00 00 00 00 00 02
		00
	Strings:
		BOOTINF 20h
		BOOTDEV 21h
		KEYPTRS 23h

Handle 0x0038, DMI type 131, 11 bytes
OEM-specific Type
	Header and Data:
		83 0B 38 00 00 00 E8 FF C5 01 01
	Strings:
		IBM System Metrics

Handle 0x0039, DMI type 132, 7 bytes
OEM-specific Type
	Header and Data:
		84 07 39 00 01 D8 36

Handle 0x003A, DMI type 133, 5 bytes
OEM-specific Type
	Header and Data:
		85 05 3A 00 01
	Strings:
		KHOIHGIUCCHHII

Handle 0x003B, DMI type 134, 13 bytes
OEM-specific Type
	Header and Data:
		86 0D 3B 00 0B 00 04 02 0B 00 17 02 0B

Handle 0x003C, DMI type 135, 13 bytes
OEM-specific Type
	Header and Data:
		87 0D 3C 00 54 50 07 00 01 01 00 00 00

Handle 0x003D, DMI type 135, 18 bytes
OEM-specific Type
	Header and Data:
		87 12 3D 00 54 50 07 01 01 9F 00 00 00 00 00 00
		00 00

Handle 0x003E, DMI type 136, 6 bytes
OEM-specific Type
	Header and Data:
		88 06 3E 00 5A 5A

Handle 0x003F, DMI type 127, 4 bytes
End Of Table


[-- Attachment #3: vpddecode.out --]
[-- Type: text/plain, Size: 162 bytes --]

# vpddecode 2.8
BIOS Build ID: 76ET58WW 
Product Name: Thinkpad R52
Box Serial Number: L3BNV57
Motherboard Serial Number: 1ZB0C5C645Y
Machine Type/Model: 1846AQG

[PATCH 2.6.16-rc4] hdaps: add support for Thinkpad R52

[Frank Gevaerts]

This adds support for my Thinkpad R52, which for some reason is not
matched by the "ThinkPad R52" line.

Signed-off-by: Frank Gevaerts <frank@gevaerts.be>

diff -ur linux-2.6.16-rc4/drivers/hwmon/hdaps.c linux-2.6.16-rc4-fg/drivers/hwmon/hdaps.c
--- linux-2.6.16-rc4/drivers/hwmon/hdaps.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.16-rc4-fg/drivers/hwmon/hdaps.c	2006-02-24 13:25:53.000000000 +0100
@@ -515,6 +515,7 @@
 
 	/* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
 	struct dmi_system_id hdaps_whitelist[] = {
+		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
 		HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),

Re: patch : hdaps on Thinkpad R52

[Jean Delvare]

Hi Frank,

> > I have some doubt about this. The Thinkpad R52 is already supported
> > (with identifier string "ThinkPad R52", unsuprisingly) and "ThinkPad H"
> > doesn't exactly sound sane. Looks like your DMI data is corrupted or
> > something. Could you please provide the output of dmidecode and
> > vpddecode on your laptop?
> 
> They are attached.

> # dmidecode 2.8
> (...)
> System Information
> 	Manufacturer: IBM
> 	Product Name: 1846AQG
> 	Version: ThinkPad H   

OK, so as strange as it sounds, that's really the string as stored in
the DMI table. How odd... You have to understand that I'm a bit
reluctant to adding it officially to the hdaps driver, given that it
clearly looks like a bogus table in your laptop. I guess that you only
have one laptop with this string?

Can you please check for a BIOS update for your laptop? Maybe that will
fix the string.

Thanks,
-- 
Jean Delvare

Re: patch : hdaps on Thinkpad R52

[Frank Gevaerts]

On Sat, Apr 01, 2006 at 05:04:22PM +0200, Jean Delvare wrote:
> Hi Frank,
> 
> > > I have some doubt about this. The Thinkpad R52 is already supported
> > > (with identifier string "ThinkPad R52", unsuprisingly) and "ThinkPad H"
> > > doesn't exactly sound sane. Looks like your DMI data is corrupted or
> > > something. Could you please provide the output of dmidecode and
> > > vpddecode on your laptop?
> > 
> > They are attached.
> 
> > # dmidecode 2.8
> > (...)
> > System Information
> > 	Manufacturer: IBM
> > 	Product Name: 1846AQG
> > 	Version: ThinkPad H   
> 
> OK, so as strange as it sounds, that's really the string as stored in
> the DMI table.

Yes. That's where I looked when I made the patch.

> How odd... You have to understand that I'm a bit
> reluctant to adding it officially to the hdaps driver, given that it
> clearly looks like a bogus table in your laptop.

If I am the only one with that entry, it obviously makes more sense that
I apply the patch locally.

> I guess that you only have one laptop with this string?

It's the only thinkpad I have, so yes. I'll ask around on the thinkwiki
mailing list and irc channels

> Can you please check for a BIOS update for your laptop? Maybe that will
> fix the string.

I updated the bios and embedded controller program to the latest
version, and that didn't help. The dmidecode output changed as follows:

--- dmidecode.old       2006-04-01 23:21:46.000000000 +0200
+++ dmidecode.new       2006-04-01 23:21:39.000000000 +0200
@@ -6,8 +6,8 @@
 Handle 0x0000, DMI type 0, 20 bytes
 BIOS Information
        Vendor: IBM
-       Version: 76ET58WW (1.18 )
-       Release Date: 07/19/2005
+       Version: 76ET63WW (1.23 )
+       Release Date: 02/14/2006
        Address: 0xDC000
        Runtime Size: 144 kB
        ROM Size: 1024 kB
@@ -361,7 +361,7 @@
 
 Handle 0x0029, DMI type 11, 5 bytes
 OEM Strings
-       String 1: IBM ThinkPad Embedded Controller -[76HT14WW-1.04    ]-
+       String 1: IBM ThinkPad Embedded Controller -[76HT15WW-1.05    ]-
 
 Handle 0x002A, DMI type 13, 22 bytes
 BIOS Language Information
@@ -516,7 +516,7 @@
 Handle 0x003B, DMI type 134, 13 bytes
 OEM-specific Type
        Header and Data:
-               86 0D 3B 00 0B 00 04 02 0B 00 17 02 0B
+               86 0D 3B 00 02 0B 00 09 02 0B 00 12 02
 
 Handle 0x003C, DMI type 135, 13 bytes
 OEM-specific Type

Frank

> Thanks,
> -- 
> Jean Delvare

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

Re: patch : hdaps on Thinkpad R52

[Frank Gevaerts]

On Sat, Apr 01, 2006 at 05:04:22PM +0200, Jean Delvare wrote:
> Hi Frank,
> 
> > # dmidecode 2.8
> > (...)
> > System Information
> > 	Manufacturer: IBM
> > 	Product Name: 1846AQG
> > 	Version: ThinkPad H   
> 
> OK, so as strange as it sounds, that's really the string as stored in
> the DMI table. How odd... You have to understand that I'm a bit
> reluctant to adding it officially to the hdaps driver, given that it
> clearly looks like a bogus table in your laptop. I guess that you only
> have one laptop with this string?

I just had a mail from another R52 user, reporting that his system
(also 1846AQG) also reports ThinkPad H.

Frank

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

Re: patch : hdaps on Thinkpad R52

[Jean Delvare]

Hi Franck,

Sorry for the late answer...

> > OK, so as strange as it sounds, that's really the string as stored in
> > the DMI table. How odd... You have to understand that I'm a bit
> > reluctant to adding it officially to the hdaps driver, given that it
> > clearly looks like a bogus table in your laptop. I guess that you only
> > have one laptop with this string?
> 
> I just had a mail from another R52 user, reporting that his system
> (also 1846AQG) also reports ThinkPad H.

I gathered data on my side too, the three R52 I had reports for used
"ThinkPad R52" but these had different machine type/model. I guess that
the 1846AQG is somehow different, but probably you don't know why?

So I suppose we could add that "ThinkPad H" identifier string to the
hdaps driver after all, as you proposed in the first place. I'm only
worried that the "H" suffix is really short, and I hope that no other
model not supported by the driver (or needing the invert option) will
ever have the same identifier. Time will tell.

Thanks,
-- 
Jean Delvare

Re: patch : hdaps on Thinkpad R52

[Frank Gevaerts]

On Sat, Apr 08, 2006 at 05:02:38PM +0200, Jean Delvare wrote:
> Hi Franck,
> 
> Sorry for the late answer...
> 
> > > OK, so as strange as it sounds, that's really the string as stored in
> > > the DMI table. How odd... You have to understand that I'm a bit
> > > reluctant to adding it officially to the hdaps driver, given that it
> > > clearly looks like a bogus table in your laptop. I guess that you only
> > > have one laptop with this string?
> > 
> > I just had a mail from another R52 user, reporting that his system
> > (also 1846AQG) also reports ThinkPad H.
> 
> I gathered data on my side too, the three R52 I had reports for used
> "ThinkPad R52" but these had different machine type/model. I guess that
> the 1846AQG is somehow different, but probably you don't know why?

No.

> So I suppose we could add that "ThinkPad H" identifier string to the
> hdaps driver after all, as you proposed in the first place. I'm only
> worried that the "H" suffix is really short, and I hope that no other
> model not supported by the driver (or needing the invert option) will
> ever have the same identifier. Time will tell.

If it turns out to be a problem, the best solution might be to also
(optionally) check the 'Product Name' field. I don't know how hard this
would be.

Frank

> Thanks,
> -- 
> Jean Delvare

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

Re: patch : hdaps on Thinkpad R52

[Jean Delvare]

Hi Franck,

Quoting myself back in April:
> > I just had a mail from another R52 user, reporting that his system
> > (also 1846AQG) also reports ThinkPad H.
> 
> I gathered data on my side too, the three R52 I had reports for used
> "ThinkPad R52" but these had different machine type/model. I guess that
> the 1846AQG is somehow different, but probably you don't know why?
> 
> So I suppose we could add that "ThinkPad H" identifier string to the
> hdaps driver after all, as you proposed in the first place. I'm only
> worried that the "H" suffix is really short, and I hope that no other
> model not supported by the driver (or needing the invert option) will
> ever have the same identifier. Time will tell.

I am told that a newer BIOS of the Thinkpad R52 fixes the machine name
in the DMI table.
http://www.thinkwiki.org/wiki/List_of_DMI_IDs#R_series
Can you please confirm this by upgrading the BIOS of your machine and
removing the "ThinkPad H" entry from the hdaps driver?

Thanks,
-- 
Jean Delvare

Re: patch : hdaps on Thinkpad R52

[Frank Gevaerts]

On Wed, Oct 11, 2006 at 04:07:45PM +0200, Jean Delvare wrote:
> Hi Franck,
> 
> Quoting myself back in April:
> > > I just had a mail from another R52 user, reporting that his system
> > > (also 1846AQG) also reports ThinkPad H.
> > 
> > I gathered data on my side too, the three R52 I had reports for used
> > "ThinkPad R52" but these had different machine type/model. I guess that
> > the 1846AQG is somehow different, but probably you don't know why?
> > 
> > So I suppose we could add that "ThinkPad H" identifier string to the
> > hdaps driver after all, as you proposed in the first place. I'm only
> > worried that the "H" suffix is really short, and I hope that no other
> > model not supported by the driver (or needing the invert option) will
> > ever have the same identifier. Time will tell.
> 
> I am told that a newer BIOS of the Thinkpad R52 fixes the machine name
> in the DMI table.
> http://www.thinkwiki.org/wiki/List_of_DMI_IDs#R_series
> Can you please confirm this by upgrading the BIOS of your machine and
> removing the "ThinkPad H" entry from the hdaps driver?

BIOS 1.25 does indeed report "ThinkPad R52" instead of "ThinkPad H", and
hdaps without "ThinkPad H" works as expected.

Frank

> 
> Thanks,
> -- 
> Jean Delvare

-- 
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan