[lm-sensors] [PATCH] hwmon, k8temp: Fix temperature reporting for ASB1 processor revisions

[Jean Delvare]

Hi Andreas,

On Tue, 22 Jun 2010 10:45:57 +0200, Andreas Herrmann wrote:
> From: Andreas Herrmann <andreas.herrmann3 at amd.com>
> 
> Reported temperature for ASB1 CPUs is too high.
> Add ASB1 CPU revisions (these are also non-desktop variants) to the
> list of CPUs for which the temperature fixup is not required.
> 
> Example: (from LENOVO ThinkPad Edge 13, 01972NG, system was idle)
> 
>   Current kernel reports
> 
>   $ sensors
>   k8temp-pci-00c3
>   Adapter: PCI adapter
>   Core0 Temp:  +74.0°C
>   Core0 Temp:  +70.0°C
>   Core1 Temp:  +69.0°C
>   Core1 Temp:  +70.0°C
> 
>   With this patch I have
> 
>   $ sensors
>   k8temp-pci-00c3
>   Adapter: PCI adapter
>   Core0 Temp:  +54.0°C
>   Core0 Temp:  +51.0°C
>   Core1 Temp:  +48.0°C
>   Core1 Temp:  +49.0°C
> 
> Cc: <stable at kernel.org> # .32.x .33.x, .34.x
> Cc: Rudolf Marek <r.marek at assembler.cz>
> Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
> ---
>  drivers/hwmon/k8temp.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> I think this patch should go into .35.

I agree, I've applied it, thanks for your contribution.

> Patch was built against Linus' git v2.6.35-rc3-3-g9a3cde2.
> (Hope that there is no conflict with your recent fix for single core
> CPUs.)

No, there is not.

> diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
> index 0ceb6d6..1fdd63e 100644
> --- a/drivers/hwmon/k8temp.c
> +++ b/drivers/hwmon/k8temp.c
> @@ -180,11 +180,13 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
>  		}
>  
>  		if ((model >= 0x69) &&
> -		    !(model == 0xc1 || model == 0x6c || model == 0x7c)) {
> +		    !(model == 0xc1 || model == 0x6c || model == 0x7c ||
> +		      model == 0x6b || model == 0x6f || model == 0x7f)) {
>  			/*
> -			 * RevG desktop CPUs (i.e. no socket S1G1 parts)
> -			 * need additional offset, otherwise reported
> -			 * temperature is below ambient temperature
> +			 * RevG desktop CPUs (i.e. no socket S1G1 or
> +			 * ASB1 parts) need additional offset,
> +			 * otherwise reported temperature is below
> +			 * ambient temperature
>  			 */
>  			data->temp_offset = 21000;
>  		}

I would like to avoid having to update this list each time a new CPU
model is released. Are there more K8 models scheduled to be released?

If there are, we should come up with a better test, either by
defaulting to no offset if all newer models don't need it, or by using
a socket-based detection as we do in the k10temp driver, assuming this
is available on the K8 as well.

Thanks,
-- 
Jean Delvare