hwmon: (pmbus/core) Add regulator event support

Add regulator events corresponding to regulator error in regulator flag
map.
Also capture the same in pmbus_regulator_get_flags.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com>
Link: https://lore.kernel.org/r/20230328150335.90238-2-Naresh.Solanki@9elements.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index d93405f..509bc0e 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -2693,9 +2693,9 @@ static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data,
        return 0;
 }
 
-/* A PMBus status flag and the corresponding REGULATOR_ERROR_* flag */
+/* A PMBus status flag and the corresponding REGULATOR_ERROR_* and REGULATOR_EVENTS_* flag */
 struct pmbus_status_assoc {
-       int pflag, rflag;
+       int pflag, rflag, eflag;
 };
 
 /* PMBus->regulator bit mappings for a PMBus status register */
@@ -2710,27 +2710,36 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[]
                .func = PMBUS_HAVE_STATUS_VOUT,
                .reg = PMBUS_STATUS_VOUT,
                .bits = (const struct pmbus_status_assoc[]) {
-                       { PB_VOLTAGE_UV_WARNING, REGULATOR_ERROR_UNDER_VOLTAGE_WARN },
-                       { PB_VOLTAGE_UV_FAULT,   REGULATOR_ERROR_UNDER_VOLTAGE },
-                       { PB_VOLTAGE_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN },
-                       { PB_VOLTAGE_OV_FAULT,   REGULATOR_ERROR_REGULATION_OUT },
+                       { PB_VOLTAGE_UV_WARNING, REGULATOR_ERROR_UNDER_VOLTAGE_WARN,
+                       REGULATOR_EVENT_UNDER_VOLTAGE_WARN },
+                       { PB_VOLTAGE_UV_FAULT,   REGULATOR_ERROR_UNDER_VOLTAGE,
+                       REGULATOR_EVENT_UNDER_VOLTAGE },
+                       { PB_VOLTAGE_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN,
+                       REGULATOR_EVENT_OVER_VOLTAGE_WARN },
+                       { PB_VOLTAGE_OV_FAULT,   REGULATOR_ERROR_REGULATION_OUT,
+                       REGULATOR_EVENT_OVER_VOLTAGE_WARN },
                        { },
                },
        }, {
                .func = PMBUS_HAVE_STATUS_IOUT,
                .reg = PMBUS_STATUS_IOUT,
                .bits = (const struct pmbus_status_assoc[]) {
-                       { PB_IOUT_OC_WARNING,    REGULATOR_ERROR_OVER_CURRENT_WARN },
-                       { PB_IOUT_OC_FAULT,      REGULATOR_ERROR_OVER_CURRENT },
-                       { PB_IOUT_OC_LV_FAULT,   REGULATOR_ERROR_OVER_CURRENT },
+                       { PB_IOUT_OC_WARNING,   REGULATOR_ERROR_OVER_CURRENT_WARN,
+                       REGULATOR_EVENT_OVER_CURRENT_WARN },
+                       { PB_IOUT_OC_FAULT,     REGULATOR_ERROR_OVER_CURRENT,
+                       REGULATOR_EVENT_OVER_CURRENT },
+                       { PB_IOUT_OC_LV_FAULT,  REGULATOR_ERROR_OVER_CURRENT,
+                       REGULATOR_EVENT_OVER_CURRENT },
                        { },
                },
        }, {
                .func = PMBUS_HAVE_STATUS_TEMP,
                .reg = PMBUS_STATUS_TEMPERATURE,
                .bits = (const struct pmbus_status_assoc[]) {
-                       { PB_TEMP_OT_WARNING,    REGULATOR_ERROR_OVER_TEMP_WARN },
-                       { PB_TEMP_OT_FAULT,      REGULATOR_ERROR_OVER_TEMP },
+                       { PB_TEMP_OT_WARNING,    REGULATOR_ERROR_OVER_TEMP_WARN,
+                       REGULATOR_EVENT_OVER_TEMP_WARN },
+                       { PB_TEMP_OT_FAULT,      REGULATOR_ERROR_OVER_TEMP,
+                       REGULATOR_EVENT_OVER_TEMP },
                        { },
                },
        },
@@ -2790,7 +2799,7 @@ static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags)
 }
 
 static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags,
-                           bool notify)
+                          unsigned int *event, bool notify)
 {
        int i, status;
        const struct pmbus_status_category *cat;
@@ -2800,6 +2809,7 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
        int func = data->info->func[page];
 
        *flags = 0;
+       *event = 0;
 
        for (i = 0; i < ARRAY_SIZE(pmbus_status_flag_map); i++) {
                cat = &pmbus_status_flag_map[i];
@@ -2810,10 +2820,11 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
                if (status < 0)
                        return status;
 
-               for (bit = cat->bits; bit->pflag; bit++) {
-                       if (status & bit->pflag)
+               for (bit = cat->bits; bit->pflag; bit++)
+                       if (status & bit->pflag) {
                                *flags |= bit->rflag;
-               }
+                               *event |= bit->eflag;
+                       }
 
                if (notify && status)
                        pmbus_notify(data, page, cat->reg, status);
@@ -2834,20 +2845,28 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
                return status;
 
        if (_pmbus_is_enabled(dev, page)) {
-               if (status & PB_STATUS_OFF)
+               if (status & PB_STATUS_OFF) {
                        *flags |= REGULATOR_ERROR_FAIL;
+                       *event |= REGULATOR_EVENT_FAIL;
+               }
 
-               if (status & PB_STATUS_POWER_GOOD_N)
+               if (status & PB_STATUS_POWER_GOOD_N) {
                        *flags |= REGULATOR_ERROR_REGULATION_OUT;
+                       *event |= REGULATOR_EVENT_REGULATION_OUT;
+               }
        }
        /*
         * Unlike most other status bits, PB_STATUS_{IOUT_OC,VOUT_OV} are
         * defined strictly as fault indicators (not warnings).
         */
-       if (status & PB_STATUS_IOUT_OC)
+       if (status & PB_STATUS_IOUT_OC) {
                *flags |= REGULATOR_ERROR_OVER_CURRENT;
-       if (status & PB_STATUS_VOUT_OV)
+               *event |= REGULATOR_EVENT_OVER_CURRENT;
+       }
+       if (status & PB_STATUS_VOUT_OV) {
                *flags |= REGULATOR_ERROR_REGULATION_OUT;
+               *event |= REGULATOR_EVENT_FAIL;
+       }
 
        /*
         * If we haven't discovered any thermal faults or warnings via
@@ -2855,19 +2874,22 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
         * a (conservative) best-effort interpretation.
         */
        if (!(*flags & (REGULATOR_ERROR_OVER_TEMP | REGULATOR_ERROR_OVER_TEMP_WARN)) &&
-           (status & PB_STATUS_TEMPERATURE))
+           (status & PB_STATUS_TEMPERATURE)) {
                *flags |= REGULATOR_ERROR_OVER_TEMP_WARN;
+               *event |= REGULATOR_EVENT_OVER_TEMP_WARN;
+       }
+
 
        return 0;
 }
 
 static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags,
-                                         bool notify)
+                                         unsigned int *event, bool notify)
 {
        int ret;
 
        mutex_lock(&data->update_lock);
-       ret = _pmbus_get_flags(data, page, flags, notify);
+       ret = _pmbus_get_flags(data, page, flags, event, notify);
        mutex_unlock(&data->update_lock);
 
        return ret;
@@ -2911,8 +2933,9 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned
        struct device *dev = rdev_get_dev(rdev);
        struct i2c_client *client = to_i2c_client(dev->parent);
        struct pmbus_data *data = i2c_get_clientdata(client);
+       int event;
 
-       return pmbus_get_flags(data, rdev_get_id(rdev), flags, false);
+       return pmbus_get_flags(data, rdev_get_id(rdev), flags, &event, false);
 }
 
 static int pmbus_regulator_get_status(struct regulator_dev *rdev)
@@ -3152,10 +3175,11 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)
 {
        struct pmbus_data *data = pdata;
        struct i2c_client *client = to_i2c_client(data->dev);
-       int i, status;
+
+       int i, status, event;
        mutex_lock(&data->update_lock);
        for (i = 0; i < data->info->pages; i++)
-               _pmbus_get_flags(data, i, &status, true);
+               _pmbus_get_flags(data, i, &status, &event, true);
 
        pmbus_clear_faults(client);
        mutex_unlock(&data->update_lock);