Commit 145e74a4 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (adm1031) Fix writes to limit registers 



Upper limit for write operations to temperature limit registers
was clamped to a fractional value. However, limit registers do
not support fractional values. As a result, upper limits of 127.5
degrees C or higher resulted in a rounded limit of 128 degrees C.
Since limit registers are signed, this was stored as -128 degrees C.
Clamp limits to (-55, +127) degrees C to solve the problem.

Value on writes to auto_temp[12]_min and auto_temp[12]_max were not
clamped at all, but masked. As a result, out-of-range writes resulted
in a more or less arbitrary limit. Clamp those attributes to (0, 127)
degrees C for more predictable results.

Cc: Axel Lin <axel.lin@ingics.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent c024044d

drivers/hwmon/adm1031.c

+5 −3
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ set_auto_temp_min(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, 0, 127000);

	mutex_lock(&data->update_lock);

	data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]);

	adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
@@ -394,6 +395,7 @@ set_auto_temp_max(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, 0, 127000);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr],

						  data->pwm[nr]);
@@ -696,7 +698,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_min[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MIN(nr),
@@ -717,7 +719,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MAX(nr),
@@ -738,7 +740,7 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_crit[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_CRIT(nr),

CRA Git | Maintained and supported by SUSTech CRA and CCSE