hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck
maintainerPATCH 1/2 hwmon: (max6697) Fix swapped temp{1,8} critical alarms
The critical alarm bit for the local temperature sensor (temp1) is in bit 7 of register 0x45 (not bit 6), and the critical alarm bit for remote temperature sensor 7 (temp8) is in bit 6 (not bit 7).
This only affects MAX6581 since all other chips supported by this driver do not support those critical alarms.
--- drivers/hwmon/max6697.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/max6697.c +2 -2
@@ -428,14 +428,14 @@ static SENSOR_DEVICE_ATTR_RO(temp6_max_alarm, alarm, 20); static SENSOR_DEVICE_ATTR_RO(temp7_max_alarm, alarm, 21); static SENSOR_DEVICE_ATTR_RO(temp8_max_alarm, alarm, 23); -static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 14); +static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 15); static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 8); static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 9); static SENSOR_DEVICE_ATTR_RO(temp4_crit_alarm, alarm, 10); static SENSOR_DEVICE_ATTR_RO(temp5_crit_alarm, alarm, 11); static SENSOR_DEVICE_ATTR_RO(temp6_crit_alarm, alarm, 12); static SENSOR_DEVICE_ATTR_RO(temp7_crit_alarm, alarm, 13); -static SENSOR_DEVICE_ATTR_RO(temp8_crit_alarm, alarm, 15); +static SENSOR_DEVICE_ATTR_RO(temp8_crit_alarm, alarm, 14); static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 1); static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 2);
Signature · 1 line
2.39.2
Guenter Roeck
maintainerPATCH 2/2 hwmon: (max6697) Fix underflow when writing limit attributes
Using DIV_ROUND_CLOSEST() on an unbound value can result in underflows. Indeed, module test scripts report:
temp1_max: Suspected underflow: [min=0, read 255000, written -9223372036854775808]temp1_crit: Suspected underflow: [min=0, read 255000, written -9223372036854775808]
Fix by introducing an extra set of clamping.
--- drivers/hwmon/max6697.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/max6697.c +1 -0
@@ -311,6 +311,7 @@ static ssize_t temp_store(struct device *dev,return ret;mutex_lock (&data->update_lock); + temp =clamp_val (temp,-1000000 ,1000000 );/* prevent underflow */ temp =DIV_ROUND_CLOSEST (temp,1000 ) + data->temp_offset; temp =clamp_val (temp,0 , data->type == max6581 ?255 :127 ); data->temp[nr][index] = temp;
Signature · 1 line
2.39.2
Quoted 9 lines · Guenter Roeck
The critical alarm bit for the local temperature sensor (temp1) is in bit 7 of register
0x45(not bit 6), and the critical alarm bit for remote temperature sensor 7 (temp8) is in bit 6 (not bit 7).This only affects MAX6581 since all other chips supported by this driver do not support those critical alarms.
Fixes 5372d2d71c46 ("hwmon: Driver for Maxim MAX6697 and compatibles")Signed-off-by Guenter Roeck <[email protected]>
Double checked with the datasheet[1],
[1]: https://www.analog.com/media/en/technical-documentation/data-sheets/max6581.pdf
Re: [PATCH 2/2] hwmon: (max6697) Fix underflow when writing limit attributes
In reply to Guenter RoeckQuoted 10 lines · Guenter Roeck
Using
DIV_ROUND_CLOSEST()on an unbound value can result in underflows. Indeed, module test scripts report:
temp1_max: Suspected underflow: [min=0, read 255000, written -9223372036854775808]temp1_crit: Suspected underflow: [min=0, read 255000, written -9223372036854775808]Fix by introducing an extra set of clamping.
Fixes 5372d2d71c46 ("hwmon: Driver for Maxim MAX6697 and compatibles")Signed-off-by Guenter Roeck <[email protected]>
Guenter Roeck
maintainerQuoted 5 lines · Tzung-Bi Shih
Quoted 4 lines · Guenter Roeck
The critical alarm bit for the local temperature sensor (temp1) is in bit 7 of register
0x45(not bit 6), and the critical alarm bit for remote temperature sensor 7 (temp8) is in bit 6 (not bit 7).
Quoted 7 lines
Quoted 5 lines
This only affects MAX6581 since all other chips supported by this driver do not support those critical alarms.
Fixes 5372d2d71c46 ("hwmon: Driver for Maxim MAX6697 and compatibles")Signed-off-by Guenter Roeck <[email protected]>Double checked with the datasheet[1],
I checked this several times because I couldn't believe that I got it wrong when I wrote the driver. Thanks a lot for the reviews and for cross-checking !
Guenter
Quoted 4 lines
Reviewed-by Tzung-Bi Shih <[email protected]>[1]: https://www.analog.com/media/en/technical-documentation/data-sheets/max6581.pdf