Re: [HWMON] x86: hwmon/k8temp.c Add support for AMD 11H

[Jaswinder Singh Rajput <jaswinder@kernel.org>]

Hello Ingo,

Now I do not use -tip tree, if you want you can remove this patch from
-tip (commit 318e6a08d340d85)

Thanks for your help and support.
--
JSR

On Thu, 2009-06-25 at 19:39 +0530, Jaswinder Singh Rajput wrote:
> Ingo,
> 
> I need to apply and then revert this patch each and every time I fetch
> -tip tree. And I need to do this many times like 20-30 times in a day.
> 
> I need this patch to monitor the temperature for AMD 11H box as it is
> very hot here temp is around 47 C and my CPU temp goes high upto 87 C.
> My one AMD box is already broken due to high temperature.
> 
> By using this patch I breaks building of the kernel as temperature
> reaches 80 C.
> 
> I hope you understand my problem.
> 
> If possible, can you please apply this patch in tip:out-of-tree 
> (not-for-upstream)
> 
> Thanks,
> --
> JSR
> 
> On Sat, 2009-06-20 at 13:26 +0530, Jaswinder Singh Rajput wrote:
> > This patch will also work for AMD 10H. But we are skipping it as :
> > 
> > AMD 10H cpus reports Inaccurate Temperature Measurement:
> > http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/41322.pdf
> > Errata #319
> > 
> > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> > ---
> >  drivers/hwmon/k8temp.c |   31 +++++++++++++++++++++++++++++--
> >  1 files changed, 29 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
> > index 1fe9951..4459dbf 100644
> > --- a/drivers/hwmon/k8temp.c
> > +++ b/drivers/hwmon/k8temp.c
> > @@ -1,5 +1,6 @@
> >  /*
> >   * k8temp.c - Linux kernel module for hardware monitoring
> > + * 	      for AMD K8 and derivatives
> >   *
> >   * Copyright (C) 2006 Rudolf Marek <r.marek@assembler.cz>
> >   *
> > @@ -33,7 +34,7 @@
> >  #include <linux/mutex.h>
> >  #include <asm/processor.h>
> >  
> > -#define TEMP_FROM_REG(val)	(((((val) >> 16) & 0xff) - 49) * 1000)
> > +#define REG_TCTL	0xa4
> >  #define REG_TEMP	0xe4
> >  #define SEL_PLACE	0x40
> >  #define SEL_CORE	0x04
> > @@ -52,6 +53,14 @@ struct k8temp_data {
> >  	u32 temp_offset;
> >  };
> >  
> > +static unsigned long temp_from_reg(unsigned long val)
> > +{
> > +	if (boot_cpu_data.x86 > 0xf)
> > +		return ((val) >> 21) * 125;
> > +	else
> > +		return ((((val) >> 16) & 0xff) - 49) * 1000;
> > +}
> > +
> >  static struct k8temp_data *k8temp_update_device(struct device *dev)
> >  {
> >  	struct k8temp_data *data = dev_get_drvdata(dev);
> > @@ -62,6 +71,11 @@ static struct k8temp_data *k8temp_update_device(struct device *dev)
> >  
> >  	if (!data->valid
> >  	    || time_after(jiffies, data->last_updated + HZ)) {
> > +		if (boot_cpu_data.x86 > 0xf) {
> > +			pci_read_config_dword(pdev, REG_TCTL,
> > +					      &data->temp[0][0]);
> > +			goto update_done;
> > +		}
> >  		pci_read_config_byte(pdev, REG_TEMP, &tmp);
> >  		tmp &= ~(SEL_PLACE | SEL_CORE);		/* Select sensor 0, core0 */
> >  		pci_write_config_byte(pdev, REG_TEMP, tmp);
> > @@ -89,6 +103,7 @@ static struct k8temp_data *k8temp_update_device(struct device *dev)
> >  			}
> >  		}
> >  
> > +update_done:
> >  		data->last_updated = jiffies;
> >  		data->valid = 1;
> >  	}
> > @@ -123,7 +138,7 @@ static ssize_t show_temp(struct device *dev,
> >  	if (data->swap_core_select)
> >  		core = core ? 0 : 1;
> >  
> > -	temp = TEMP_FROM_REG(data->temp[core][place]) + data->temp_offset;
> > +	temp = temp_from_reg(data->temp[core][place]) + data->temp_offset;
> >  
> >  	return sprintf(buf, "%d\n", temp);
> >  }
> > @@ -138,6 +153,14 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
> >  
> >  static struct pci_device_id k8temp_ids[] = {
> >  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
> > +	/*
> > +	 * AMD 10H cpus reports Inaccurate Temperature Measurement :
> > +	 * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/41322.pdf
> > +	 *     Errata #319
> > +	 * So skipping 10H
> > +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
> > +	 */
> > +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
> >  	{ 0 },
> >  };
> >  
> > @@ -157,6 +180,9 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
> >  		goto exit;
> >  	}
> >  
> > +	if (boot_cpu_data.x86 > 0xf)
> > +		goto probe_done;
> > +
> >  	model = boot_cpu_data.x86_model;
> >  	stepping = boot_cpu_data.x86_mask;
> >  
> > @@ -226,6 +252,7 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
> >  			data->sensorsp &= ~SEL_CORE;
> >  	}
> >  
> > +probe_done:
> >  	data->name = "k8temp";
> >  	mutex_init(&data->update_lock);
> >  	dev_set_drvdata(&pdev->dev, data);