qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (ina3221) Fix shunt sum critical calculation 

Bugzilla: https://bugzilla.redhat.com/2228859

commit b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef
Author: Ninad Malwade <nmalwade@nvidia.com>
Date:   Tue Nov 8 12:45:08 2022 +0800

    hwmon: (ina3221) Fix shunt sum critical calculation

    The shunt sum critical limit register value should be left shifted
    by one bit as its LSB-0 is a reserved bit.

    Fixes: 2057bdfb71 ("hwmon: (ina3221) Add summation feature support")
    Signed-off-by: Ninad Malwade <nmalwade@nvidia.com>
    Reviewed-by: Thierry Reding <treding@nvidia.com>
    Link: https://lore.kernel.org/r/20221108044508.23463-1-nmalwade@nvidia.com
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Signed-off-by: Steve Best <sbest@redhat.com>
This commit is contained in:
Steve Best 2023-08-04 14:31:20 -04:00
parent c22582e0b4
commit 1df8723291
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwmon/ina3221.c
View File

@ -228,7 +228,7 @@ static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
* Shunt Voltage Sum register has 14-bit value with 1-bit shift
* Other Shunt Voltage registers have 12 bits with 3-bit shift
*/
if (reg == INA3221_SHUNT_SUM)
if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM)
*val = sign_extend32(regval >> 1, 14);
else
*val = sign_extend32(regval >> 3, 12);
@ -465,7 +465,7 @@ static int ina3221_write_curr(struct device *dev, u32 attr,
* SHUNT_SUM: (1 / 40uV) << 1 = 1 / 20uV
* SHUNT[1-3]: (1 / 40uV) << 3 = 1 / 5uV
*/
if (reg == INA3221_SHUNT_SUM)
if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM)
regval = DIV_ROUND_CLOSEST(voltage_uv, 20) & 0xfffe;
else
regval = DIV_ROUND_CLOSEST(voltage_uv, 5) & 0xfff8;