Skip to content

Commit 227a3a2

Browse files
Eliav Farbergroeck
authored andcommitted
hwmon: (mr75203) fix voltage equation for negative source input
According to Moortec Embedded Voltage Monitor (MEVM) series 3 data sheet, the minimum input signal is -100mv and maximum input signal is +1000mv. The equation used to convert the digital word to voltage uses mixed types (*val signed and n unsigned), and on 64 bit machines also has different size, since sizeof(u32) = 4 and sizeof(long) = 8. So when measuring a negative input, n will be small enough, such that PVT_N_CONST * n < PVT_R_CONST, and the result of (PVT_N_CONST * n - PVT_R_CONST) will overflow to a very big positive 32 bit number. Then when storing the result in *val it will be the same value just in 64 bit (instead of it representing a negative number which will what happen when sizeof(long) = 4). When -1023 <= (PVT_N_CONST * n - PVT_R_CONST) <= -1 dividing the number by 1024 should result of in 0, but because ">> 10" is used, and the sign bit is used to fill the vacated bit positions, it results in -1 (0xf...fffff) which is wrong. This change fixes the sign problem and supports negative values by casting n to long and replacing the shift right with div operation. Fixes: 9d82335 ("hwmon: Add hardware monitoring driver for Moortec MR75203 PVT controller") Signed-off-by: Eliav Farber <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]>
1 parent bb9195b commit 227a3a2

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

drivers/hwmon/mr75203.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,18 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)
201201
return ret;
202202

203203
n &= SAMPLE_DATA_MSK;
204-
/* Convert the N bitstream count into voltage */
205-
*val = (PVT_N_CONST * n - PVT_R_CONST) >> PVT_CONV_BITS;
204+
/*
205+
* Convert the N bitstream count into voltage.
206+
* To support negative voltage calculation for 64bit machines
207+
* n must be cast to long, since n and *val differ both in
208+
* signedness and in size.
209+
* Division is used instead of right shift, because for signed
210+
* numbers, the sign bit is used to fill the vacated bit
211+
* positions, and if the number is negative, 1 is used.
212+
* BIT(x) may not be used instead of (1 << x) because it's
213+
* unsigned.
214+
*/
215+
*val = (PVT_N_CONST * (long)n - PVT_R_CONST) / (1 << PVT_CONV_BITS);
206216

207217
return 0;
208218
default:

0 commit comments

Comments
 (0)