hwmon: (lm95245) Fix hysteresis temperatures
Guenter Roeck
maintainerPATCH v2 1/4 hwmon: (lm95245) Fix hysteresis temperatures
Hysteresis temperatures are defined as absolute temperatures, not as delta value from the critical temperatures.
---
v2: Don't change indentation
Don't call lm95245_update_device from set function In set function, actually write the calculated hysteresis instead of the entered value.
drivers/hwmon/lm95245.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
drivers/hwmon/lm95245.c +21 -9
@@ -272,27 +272,39 @@ static ssize_t set_limit(struct device *dev, struct device_attribute *attr,return count; } +static ssize_t show_crit_hyst (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct lm95245_data *data =lm95245_update_device (dev); +int index =to_sensor_dev_attr (attr)->index; +int hyst = data->regs[index] - data->regs[8 ]; + +return snprintf (buf,PAGE_SIZE -1 ,"%d\n" , hyst *1000 ); +} +static ssize_t set_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm95245_data *data =i2c_get_clientdata (client); +int index =to_sensor_dev_attr (attr)->index;unsigned long val; +long hyst; +int limit;if (kstrtoul (buf,10 , &val) <0 )return -EINVAL ; - val /=1000 ; - - val =clamp_val (val,0 ,31 ); -mutex_lock (&data->update_lock); + limit =i2c_smbus_read_byte_data (client, lm95245_reg_address[index]); + hyst = limit - val /1000 ; + hyst =clamp_val (hyst,0 ,31 ); data->valid =0 ;/* shared crit hysteresis */ i2c_smbus_write_byte_data (client,LM95245_REG_RW_COMMON_HYSTERESIS , - val); + hyst);mutex_unlock (&data->update_lock);
@@ -378,16 +390,16 @@ static ssize_t set_interval(struct device *dev, struct device_attribute *attr, static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_input, NULL, 0); static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 6); -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 6); static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_LOC); static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_input, NULL, 2); static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 7); -static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 7); static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_RTCRIT); static SENSOR_DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type,
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Guenter,
Quoted 30 lines · Guenter Roeck
Hysteresis temperatures are defined as absolute temperatures, not as delta value from the critical temperatures.
Signed-off-by Guenter Roeck <[email protected]>---
v2: Don't change indentation
Don't calllm95245_update_devicefrom set function In set function, actually write the calculated hysteresis instead of the entered value.drivers/hwmon/lm95245.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)drivers/hwmon/lm95245.c +9
-0@@ -272,27 +272,39 @@ static ssize_t set_limit(struct device *dev, struct device_attribute *attr,return count; } +static ssize_t show_crit_hyst (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct lm95245_data *data =lm95245_update_device (dev); +int index =to_sensor_dev_attr (attr)->index; +int hyst = data->regs[index] - data->regs[8 ]; + +return snprintf (buf,PAGE_SIZE -1 ,"%d\n" , hyst *1000 ); +}
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 293
Quoted 10 lines
drivers/hwmon/lm95245.c +4
-0+static ssize_t set_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm95245_data *data =i2c_get_clientdata (client); +int index =to_sensor_dev_attr (attr)->index;unsigned long val; +long hyst; +int limit;
Nitpicking: it makes little sense to have hyst and limit as different types.
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 302
Quoted 13 lines
drivers/hwmon/lm95245.c +3
-4if (kstrtoul (buf,10 , &val) <0 )return -EINVAL ; - val /=1000 ; - - val =clamp_val (val,0 ,31 ); -mutex_lock (&data->update_lock); + limit =i2c_smbus_read_byte_data (client, lm95245_reg_address[index]); + hyst = limit - val /1000 ; + hyst =clamp_val (hyst,0 ,31 );
Note that you don't actually need to hold the lock for that. Access to the SMBus itself is already serialized at the bus driver level, and you're not touching any field of the data structure (that's what the lock is protecting.)
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 303
Quoted 1 line
drivers/hwmon/lm95245.c +0
-0data->valid =0 ;
BTW do you have any idea why the whole cache is invalidated here? I'd think that storing hyst as data->regs[8] would be enough?
Quoted 19 lines
drivers/hwmon/lm95245.c +3
-3/* shared crit hysteresis */ i2c_smbus_write_byte_data (client,LM95245_REG_RW_COMMON_HYSTERESIS , - val); + hyst);mutex_unlock (&data->update_lock);@@ -378,16 +390,16 @@ static ssize_t set_interval(struct device *dev, struct device_attribute *attr, static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_input, NULL, 0); static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 6); -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 6); static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_LOC);
drivers/hwmon/lm95245.c static ssize_t set_interval(struct device *dev, struct device_attribute *attr, · line 405
Quoted 10 lines
drivers/hwmon/lm95245.c +2
-2static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_input, NULL, 2); static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 7); -static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 7); static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_RTCRIT); static SENSOR_DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type,
Signature · 7 lines
Jean Delvare Suse L3 Support _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerHi Jean,
Quoted 38 lines · Jean Delvare
Hi Guenter,
Quoted 35 lines · Guenter Roeck
Hysteresis temperatures are defined as absolute temperatures, not as delta value from the critical temperatures.
Signed-off-by Guenter Roeck <[email protected]>---
v2: Don't change indentation
Don't calllm95245_update_devicefrom set function In set function, actually write the calculated hysteresis instead of the entered value.drivers/hwmon/lm95245.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)drivers/hwmon/lm95245.c +10
-0@@ -272,27 +272,39 @@ static ssize_t set_limit(struct device *dev, struct device_attribute *attr,return count; } +static ssize_t show_crit_hyst (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct lm95245_data *data =lm95245_update_device (dev); +int index =to_sensor_dev_attr (attr)->index; +int hyst = data->regs[index] - data->regs[8 ]; + +return snprintf (buf,PAGE_SIZE -1 ,"%d\n" , hyst *1000 ); +} +static ssize_t set_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);
Quoted 9 lines
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 293
Quoted 5 lines
drivers/hwmon/lm95245.c +3
-0struct lm95245_data *data =i2c_get_clientdata (client); +int index =to_sensor_dev_attr (attr)->index;unsigned long val; +long hyst; +int limit;Nitpicking: it makes little sense to have hyst and limit as different types.
Ok, I'll change that.
Quoted 10 lines
Quoted 10 lines
drivers/hwmon/lm95245.c +0
-4if (kstrtoul (buf,10 , &val) <0 )return -EINVAL ; - val /=1000 ; - - val =clamp_val (val,0 ,31 ); -mutex_lock (&data->update_lock);
Quoted 9 lines
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 302
Quoted 3 lines
drivers/hwmon/lm95245.c +3
-0+ limit =i2c_smbus_read_byte_data (client, lm95245_reg_address[index]); + hyst = limit - val /1000 ; + hyst =clamp_val (hyst,0 ,31 );Note that you don't actually need to hold the lock for that. Access to the SMBus itself is already serialized at the bus driver level, and you're not touching any field of the data structure (that's what the lock is protecting.)
I think it was because the valid flag is cleared, to make sure the data is only re-read after the hysteresis register is written to.
Quoted 5 lines
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 303
Quoted 1 line
drivers/hwmon/lm95245.c +0
-0data->valid =0 ;BTW do you have any idea why the whole cache is invalidated here? I'd think that storing hyst as data->regs[8] would be enough?
It also ensures that the limit register value in the cache is current, but since that is not volatile it should not really make a difference.
I'll change that and only update regs[8]. But then I do need the lock, or at least I think so.
Quoted 19 lines
Quoted 19 lines
drivers/hwmon/lm95245.c +3
-3/* shared crit hysteresis */ i2c_smbus_write_byte_data (client,LM95245_REG_RW_COMMON_HYSTERESIS , - val); + hyst);mutex_unlock (&data->update_lock);@@ -378,16 +390,16 @@ static ssize_t set_interval(struct device *dev, struct device_attribute *attr, static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_input, NULL, 0); static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 6); -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 6); static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_LOC);
Quoted 13 lines
drivers/hwmon/lm95245.c static ssize_t set_interval(struct device *dev, struct device_attribute *attr, · line 405
Quoted 10 lines
drivers/hwmon/lm95245.c +2
-2static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_input, NULL, 2); static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_limit, set_limit, 7); -static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_limit, - set_crit_hyst, 8); +static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_crit_hyst, + set_crit_hyst, 7); static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, STATUS1_RTCRIT); static SENSOR_DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type,Reviewed-by Jean Delvare <[email protected]>
Thanks!
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 21 lines · Guenter Roeck
Quoted 11 lines · Jean Delvare
Quoted 10 lines · Guenter Roeck
if (
kstrtoul(buf, 10, &val)< 0)
return-EINVAL;drivers/hwmon/lm95245.c +0
-4- val /=1000 ; - - val =clamp_val (val,0 ,31 ); -mutex_lock (&data->update_lock);Quoted 8 lines
drivers/hwmon/lm95245.c static ssize_t set_limit(struct device *dev, struct device_attribute *attr, · line 302
Quoted 3 lines
drivers/hwmon/lm95245.c +3
-0+ limit =i2c_smbus_read_byte_data (client, lm95245_reg_address[index]); + hyst = limit - val /1000 ; + hyst =clamp_val (hyst,0 ,31 );Note that you don't actually need to hold the lock for that. Access to the SMBus itself is already serialized at the bus driver level, and you're not touching any field of the data structure (that's what the lock is protecting.)
Quoted 2 lines
I think it was because the valid flag is cleared, to make sure the data is only re-read after the hysteresis register is written to.
I can't think of a scenario where it would make a difference. Trying to set the limit and the hysteresis at the same time is racy by nature, I don't think any amount of locking can help.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
data->valid = 0;BTW do you have any idea why the whole cache is invalidated here? I'd think that storing hyst as data->regs[8] would be enough?
It also ensures that the limit register value in the cache is current, but since that is not volatile it should not really make a difference.
Agreed.
Quoted 2 lines
I'll change that and only update regs[8]. But then I do need the lock, or at least I think so.
Yes, you do.
Thanks,
Signature · 7 lines
Jean Delvare Suse L3 Support _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors