]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
hwmon: (pmbus) Add Vin unit off handling
authorBrandon Wyman <bjwyman@gmail.com>
Thu, 17 Mar 2022 23:21:23 +0000 (23:21 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:38:03 +0000 (14:38 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit a5436af598779219b375c1977555c82def1c35d0 ]

If there is an input undervoltage fault, reported in STATUS_INPUT
command response, there is quite likely a "Unit Off For Insufficient
Input Voltage" condition as well.

Add a constant for bit 3 of STATUS_INPUT. Update the Vin limit
attributes to include both bits in the mask for clearing faults.

If an input undervoltage fault occurs, causing a unit off for
insufficient input voltage, but the unit is off bit is not cleared, the
STATUS_WORD will not be updated to clear the input fault condition.
Including the unit is off bit (bit 3) allows for the input fault
condition to completely clear.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Link: https://lore.kernel.org/r/20220317232123.2103592-1-bjwyman@gmail.com
Fixes: b4ce237b7f7d3 ("hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers")
[groeck: Dropped unnecessary ()]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 9b181ad309c60c24f5dbc13133a4c2248125db96)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/hwmon/pmbus/pmbus.h
drivers/hwmon/pmbus/pmbus_core.c

index e0aa8aa46d8c49067a568c1fe6667850a13dfc35..ef3a8ecde4dfcdd27929e47cf6c13b8dbe1693e8 100644 (file)
@@ -319,6 +319,7 @@ enum pmbus_fan_mode { percent = 0, rpm };
 /*
  * STATUS_VOUT, STATUS_INPUT
  */
+#define PB_VOLTAGE_VIN_OFF             BIT(3)
 #define PB_VOLTAGE_UV_FAULT            BIT(4)
 #define PB_VOLTAGE_UV_WARNING          BIT(5)
 #define PB_VOLTAGE_OV_WARNING          BIT(6)
index b1386a4df4cc4011832f88a3e4e21e8229b68cae..ca0bfaf2f69116f820d62a81cdb1ef501bf912e5 100644 (file)
@@ -1373,7 +1373,7 @@ static const struct pmbus_limit_attr vin_limit_attrs[] = {
                .reg = PMBUS_VIN_UV_FAULT_LIMIT,
                .attr = "lcrit",
                .alarm = "lcrit_alarm",
-               .sbit = PB_VOLTAGE_UV_FAULT,
+               .sbit = PB_VOLTAGE_UV_FAULT | PB_VOLTAGE_VIN_OFF,
        }, {
                .reg = PMBUS_VIN_OV_WARN_LIMIT,
                .attr = "max",