Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa758702 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux 

* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) Initialize tmin
  hwmon: (pmbus) Fix low limit temperature alarms
parents f1fcd9f0 cd5bd3df

drivers/hwmon/coretemp.c

+6 −1
Original line number Diff line number Diff line
@@ -601,7 +601,12 @@ static int create_core_data(struct platform_data *pdata, 
	err = rdmsr_safe_on_cpu(cpu, tdata->intrpt_reg, &eax, &edx);

	if (!err) {

		tdata->attr_size += MAX_THRESH_ATTRS;

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

		tdata->tmin = tdata->tjmax -

			      ((eax & THERM_MASK_THRESHOLD0) >>

			       THERM_SHIFT_THRESHOLD0) * 1000;

		tdata->ttarget = tdata->tjmax -

				 ((eax & THERM_MASK_THRESHOLD1) >>

				  THERM_SHIFT_THRESHOLD1) * 1000;

	}



	pdata->core_data[attr_no] = tdata;

drivers/hwmon/pmbus/pmbus_core.c

+8 −1
Original line number Diff line number Diff line
@@ -978,6 +978,8 @@ static void pmbus_find_max_attr(struct i2c_client *client, 
struct pmbus_limit_attr {

	u16 reg;		/* Limit register */

	bool update;		/* True if register needs updates */

	bool low;		/* True if low limit; for limits with compare

				   functions only */

	const char *attr;	/* Attribute name */

	const char *alarm;	/* Alarm attribute name */

	u32 sbit;		/* Alarm attribute status bit */
@@ -1029,7 +1031,8 @@ static bool pmbus_add_limit_attrs(struct i2c_client *client, 
				if (attr->compare) {

					pmbus_add_boolean_cmp(data, name,

						l->alarm, index,

						cbase, cindex,

						l->low ? cindex : cbase,

						l->low ? cbase : cindex,

						attr->sbase + page, l->sbit);

				} else {

					pmbus_add_boolean_reg(data, name,
@@ -1366,11 +1369,13 @@ static const struct pmbus_sensor_attr power_attributes[] = { 
static const struct pmbus_limit_attr temp_limit_attrs[] = {

	{

		.reg = PMBUS_UT_WARN_LIMIT,

		.low = true,

		.attr = "min",

		.alarm = "min_alarm",

		.sbit = PB_TEMP_UT_WARNING,

	}, {

		.reg = PMBUS_UT_FAULT_LIMIT,

		.low = true,

		.attr = "lcrit",

		.alarm = "lcrit_alarm",

		.sbit = PB_TEMP_UT_FAULT,
@@ -1399,11 +1404,13 @@ static const struct pmbus_limit_attr temp_limit_attrs[] = { 
static const struct pmbus_limit_attr temp_limit_attrs23[] = {

	{

		.reg = PMBUS_UT_WARN_LIMIT,

		.low = true,

		.attr = "min",

		.alarm = "min_alarm",

		.sbit = PB_TEMP_UT_WARNING,

	}, {

		.reg = PMBUS_UT_FAULT_LIMIT,

		.low = true,

		.attr = "lcrit",

		.alarm = "lcrit_alarm",

		.sbit = PB_TEMP_UT_FAULT,