hwmon: (ina3221) Fix shunt sum critical calculation
authorNinad Malwade <nmalwade@nvidia.com>
Tue, 8 Nov 2022 04:45:08 +0000 (12:45 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Dec 2022 10:28:39 +0000 (11:28 +0100)
[ Upstream commit b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef ]

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

Fixes: 2057bdfb7184 ("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: Sasha Levin <sashal@kernel.org>
drivers/hwmon/ina3221.c

index 58d3828..14586b2 100644 (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;