| Message ID | 20230217083631.657430-4-Naresh.Solanki@9elements.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v3,1/4] hwmon: (pmbus/core): Generalize pmbus status flag map | expand |
On 2/17/23 00:36, Naresh Solanki wrote: > From: Patrick Rudolph <patrick.rudolph@9elements.com> > > Notify hwmon events using the pmbus irq handler. > > Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> > Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com> > ... > Changes in V3: > - Remove empty line > - locked version of pmbus_get_flags > Changes in V2 > - Remove __maybe_unsed attribute as its not needed. > --- > drivers/hwmon/pmbus/pmbus_core.c | 48 ++++++++++++++++++++++++++++---- > 1 file changed, 43 insertions(+), 5 deletions(-) > > diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c > index d0415d5ac7d9..2d10a354fe7a 100644 > --- a/drivers/hwmon/pmbus/pmbus_core.c > +++ b/drivers/hwmon/pmbus/pmbus_core.c > @@ -2761,7 +2761,35 @@ static int __maybe_unused pmbus_is_enabled(struct device *dev, u8 page) > return !!(ret & PB_OPERATION_CONTROL_ON); > } > > -static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags) > +#define to_dev_attr(_dev_attr) \ > + container_of(_dev_attr, struct device_attribute, attr) > + > +static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags) > +{ > + int i; > + > + for (i = 0; i < data->num_attributes; i++) { > + struct device_attribute *da = to_dev_attr(data->group.attrs[i]); > + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > + int index = attr->index; > + u16 smask = pb_index_to_mask(index); > + u8 spage = pb_index_to_page(index); > + u16 sreg = pb_index_to_reg(index); > + > + if (reg == sreg && page == spage && (smask & flags)) { > + dev_dbg(data->dev, "sysfs notify: %s", da->attr.name); > + sysfs_notify(&data->dev->kobj, NULL, da->attr.name); > + kobject_uevent(&data->dev->kobj, KOBJ_CHANGE); > + flags &= ~smask; > + } > + > + if (!flags) > + break; > + } > +} > + > +static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags, > + bool notify) > { > int i, status; > const struct pmbus_status_category *cat; > @@ -2785,6 +2813,10 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag > if (status & bit->pflag) > *flags |= bit->rflag; > } > + > + if (notify && status) > + pmbus_notify(data, page, cat->reg, status); > + > } > > /* > @@ -2828,12 +2860,13 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag > return 0; > } > > -static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags) > +static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags, > + bool notify) > { > int ret; > > mutex_lock(&data->update_lock); > - ret = _pmbus_get_flags(data, page, flags); > + ret = _pmbus_get_flags(data, page, flags, notify); > mutex_unlock(&data->update_lock); > > return ret; > @@ -2878,7 +2911,7 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned > struct i2c_client *client = to_i2c_client(dev->parent); > struct pmbus_data *data = i2c_get_clientdata(client); > > - return pmbus_get_flags(data, rdev_get_id(rdev), flags); > + return pmbus_get_flags(data, rdev_get_id(rdev), flags, false); > } > > static int pmbus_regulator_get_status(struct regulator_dev *rdev) > @@ -3114,10 +3147,14 @@ 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, ret; > > mutex_lock(&data->update_lock); > for (i = 0; i < data->info->pages; i++) { > + ret = _pmbus_get_flags(data, i, &status, true); > + if (ret) > + return ret; > + Same as with patch 3 - this is not a valid return value for an interrupt handler. > status = pmbus_read_status_word(client, i); > if (status < 0) { > mutex_unlock(&data->update_lock); > @@ -3126,6 +3163,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) > > if (status & ~(PB_STATUS_OFF | PB_STATUS_BUSY | PB_STATUS_POWER_GOOD_N)) > pmbus_clear_fault_page(client, i); > + Stray whitespace change. > } > mutex_unlock(&data->update_lock); >
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index d0415d5ac7d9..2d10a354fe7a 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2761,7 +2761,35 @@ static int __maybe_unused pmbus_is_enabled(struct device *dev, u8 page) return !!(ret & PB_OPERATION_CONTROL_ON); } -static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags) +#define to_dev_attr(_dev_attr) \ + container_of(_dev_attr, struct device_attribute, attr) + +static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags) +{ + int i; + + for (i = 0; i < data->num_attributes; i++) { + struct device_attribute *da = to_dev_attr(data->group.attrs[i]); + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); + int index = attr->index; + u16 smask = pb_index_to_mask(index); + u8 spage = pb_index_to_page(index); + u16 sreg = pb_index_to_reg(index); + + if (reg == sreg && page == spage && (smask & flags)) { + dev_dbg(data->dev, "sysfs notify: %s", da->attr.name); + sysfs_notify(&data->dev->kobj, NULL, da->attr.name); + kobject_uevent(&data->dev->kobj, KOBJ_CHANGE); + flags &= ~smask; + } + + if (!flags) + break; + } +} + +static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags, + bool notify) { int i, status; const struct pmbus_status_category *cat; @@ -2785,6 +2813,10 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag if (status & bit->pflag) *flags |= bit->rflag; } + + if (notify && status) + pmbus_notify(data, page, cat->reg, status); + } /* @@ -2828,12 +2860,13 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag return 0; } -static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags) +static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags, + bool notify) { int ret; mutex_lock(&data->update_lock); - ret = _pmbus_get_flags(data, page, flags); + ret = _pmbus_get_flags(data, page, flags, notify); mutex_unlock(&data->update_lock); return ret; @@ -2878,7 +2911,7 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned struct i2c_client *client = to_i2c_client(dev->parent); struct pmbus_data *data = i2c_get_clientdata(client); - return pmbus_get_flags(data, rdev_get_id(rdev), flags); + return pmbus_get_flags(data, rdev_get_id(rdev), flags, false); } static int pmbus_regulator_get_status(struct regulator_dev *rdev) @@ -3114,10 +3147,14 @@ 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, ret; mutex_lock(&data->update_lock); for (i = 0; i < data->info->pages; i++) { + ret = _pmbus_get_flags(data, i, &status, true); + if (ret) + return ret; + status = pmbus_read_status_word(client, i); if (status < 0) { mutex_unlock(&data->update_lock); @@ -3126,6 +3163,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) if (status & ~(PB_STATUS_OFF | PB_STATUS_BUSY | PB_STATUS_POWER_GOOD_N)) pmbus_clear_fault_page(client, i); + } mutex_unlock(&data->update_lock);