Commit 561a60f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon updates from Guenter Roeck:
 "Add support for Kaveri CPUs to k10temp driver.  Add support for S12x0
  to coretemp driver.

  Cleanup and minor fixes in several drivers.  Notable are 'Do not
  return -EAGAIN for low temperatures' to coretemp and 'Re-enable
  logical device mapping for NCT6791 during resume' to nct6775.  Both
  will be sent to -stable, but only after some time in mainline"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (k10temp) Add support for Kaveri CPUs
  hwmon: (sht15) add include guard
  hwmon: (max197) add include guard
  hwmon: (nct6775) Re-enable logical device mapping for NCT6791 during resume
  hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
  hwmon: (coretemp) Do not return -EAGAIN for low temperatures
  hwmon: (da9052) Fix adc to voltage calculation
  hwmon: (coretemp) Refine TjMax detection
  hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs
  hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
  hwmon: remove DEFINE_PCI_DEVICE_TABLE macro
parents db4fcb45 d303b1b5

drivers/hwmon/coretemp.c

+42 −16
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/cpu.h>

#include <linux/smp.h>

#include <linux/moduleparam.h>

#include <linux/pci.h>

#include <asm/msr.h>

#include <asm/processor.h>

#include <asm/cpu_device_id.h>
@@ -176,20 +177,33 @@ static ssize_t show_temp(struct device *dev, 
	/* Check whether the time interval has elapsed */

	if (!tdata->valid || time_after(jiffies, tdata->last_updated + HZ)) {

		rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx);

		tdata->valid = 0;

		/* Check whether the data is valid */

		if (eax & 0x80000000) {

			tdata->temp = tdata->tjmax -

					((eax >> 16) & 0x7f) * 1000;

		/*

		 * Ignore the valid bit. In all observed cases the register

		 * value is either low or zero if the valid bit is 0.

		 * Return it instead of reporting an error which doesn't

		 * really help at all.

		 */

		tdata->temp = tdata->tjmax - ((eax >> 16) & 0x7f) * 1000;

		tdata->valid = 1;

		}

		tdata->last_updated = jiffies;

	}



	mutex_unlock(&tdata->update_lock);

	return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN;

	return sprintf(buf, "%d\n", tdata->temp);

}



struct tjmax_pci {

	unsigned int device;

	int tjmax;

};



static const struct tjmax_pci tjmax_pci_table[] = {

	{ 0x0708, 110000 },	/* CE41x0 (Sodaville ) */

	{ 0x0c72, 102000 },	/* Atom S1240 (Centerton) */

	{ 0x0c73, 95000 },	/* Atom S1220 (Centerton) */

	{ 0x0c75, 95000 },	/* Atom S1260 (Centerton) */

};



struct tjmax {

	char const *id;

	int tjmax;
@@ -198,9 +212,6 @@ struct tjmax { 
static const struct tjmax tjmax_table[] = {

	{ "CPU  230", 100000 },		/* Model 0x1c, stepping 2	*/

	{ "CPU  330", 125000 },		/* Model 0x1c, stepping 2	*/

	{ "CPU CE4110", 110000 },	/* Model 0x1c, stepping 10 Sodaville */

	{ "CPU CE4150", 110000 },	/* Model 0x1c, stepping 10	*/

	{ "CPU CE4170", 110000 },	/* Model 0x1c, stepping 10	*/

};



struct tjmax_model {
@@ -222,8 +233,11 @@ static const struct tjmax_model tjmax_model_table[] = { 
				 * is undetectable by software

				 */

	{ 0x27, ANY, 90000 },	/* Atom Medfield (Z2460) */

	{ 0x35, ANY, 90000 },	/* Atom Clover Trail/Cloverview (Z2760) */

	{ 0x36, ANY, 100000 },	/* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */

	{ 0x35, ANY, 90000 },	/* Atom Clover Trail/Cloverview (Z27x0) */

	{ 0x36, ANY, 100000 },	/* Atom Cedar Trail/Cedarview (N2xxx, D2xxx)

				 * Also matches S12x0 (stepping 9), covered by

				 * PCI table

				 */

};



static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
@@ -236,8 +250,20 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) 
	int err;

	u32 eax, edx;

	int i;

	struct pci_dev *host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));



	/*

	 * Explicit tjmax table entries override heuristics.

	 * First try PCI host bridge IDs, followed by model ID strings

	 * and model/stepping information.

	 */

	if (host_bridge && host_bridge->vendor == PCI_VENDOR_ID_INTEL) {

		for (i = 0; i < ARRAY_SIZE(tjmax_pci_table); i++) {

			if (host_bridge->device == tjmax_pci_table[i].device)

				return tjmax_pci_table[i].tjmax;

		}

	}



	/* explicit tjmax table entries override heuristics */

	for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) {

		if (strstr(c->x86_model_id, tjmax_table[i].id))

			return tjmax_table[i].tjmax;
@@ -343,12 +369,12 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) 
		if (cpu_has_tjmax(c))

			dev_warn(dev, "Unable to read TjMax from CPU %u\n", id);

	} else {

		val = (eax >> 16) & 0xff;

		val = (eax >> 16) & 0x7f;

		/*

		 * If the TjMax is not plausible, an assumption

		 * will be used

		 */

		if (val) {

		if (val >= 85) {

			dev_dbg(dev, "TjMax is %d degrees C\n", val);

			return val * 1000;

		}

drivers/hwmon/da9052-hwmon.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static const char * const input_names[] = { 
/* Conversion function for VDDOUT and VBAT */

static inline int volt_reg_to_mv(int value)

{

	return DIV_ROUND_CLOSEST(value * 1000, 512) + 2500;

	return DIV_ROUND_CLOSEST(value * 2000, 1023) + 2500;

}



/* Conversion function for ADC channels 4, 5 and 6 */
@@ -57,7 +57,7 @@ static inline int input_reg_to_mv(int value) 
/* Conversion function for VBBAT */

static inline int vbbat_reg_to_mv(int value)

{

	return DIV_ROUND_CLOSEST(value * 2500, 512);

	return DIV_ROUND_CLOSEST(value * 5000, 1023);

}



static inline int da9052_enable_vddout_channel(struct da9052 *da9052)

drivers/hwmon/fam15h_power.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static void fam15h_power_remove(struct pci_dev *pdev) 
	sysfs_remove_group(&dev->kobj, &fam15h_power_attr_group);

}



static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {

static const struct pci_device_id fam15h_power_id_table[] = {

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },

	{}

drivers/hwmon/k10temp.c

+2 −1
Original line number Diff line number Diff line
@@ -204,12 +204,13 @@ static void k10temp_remove(struct pci_dev *pdev) 
			   &sensor_dev_attr_temp1_crit_hyst.dev_attr);

}



static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {

static const struct pci_device_id k10temp_id_table[] = {

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },

	{}

};

drivers/hwmon/k8temp.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0); 
static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);

static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);



static DEFINE_PCI_DEVICE_TABLE(k8temp_ids) = {

static const struct pci_device_id k8temp_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },

	{ 0 },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE