hwmon: (pmbus/core): Add rdev in pmbus_data struct
PATCH v4 1/5 hwmon: (pmbus/core): Add rdev in pmbus_data struct
Add regulator device in pmbus_data & initialize the same during PMBus regulator register.
--- drivers/hwmon/pmbus/pmbus_core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus_core.c +7 -1
@@ -81,6 +81,7 @@ struct pmbus_label {struct pmbus_data {struct device *dev;struct device *hwmon_dev; +struct regulator_dev **rdevs;u32 flags;/* from platform data */
@@ -3053,6 +3054,11 @@ static int pmbus_regulator_register(struct pmbus_data *data)struct regulator_dev *rdev;int i; + data->rdevs =devm_kzalloc (dev,sizeof (struct regulator_dev *) * info->num_regulators, +GFP_KERNEL ); +if (!data->rdevs) +return -ENOMEM ; +for (i =0 ; i < info->num_regulators; i++) {struct regulator_config config = { };
@@ -3062,7 +3068,7 @@ static int pmbus_regulator_register(struct pmbus_data *data)if (pdata && pdata->reg_init_data) config.init_data = &pdata->reg_init_data[i]; - rdev =devm_regulator_register (dev, &info->reg_desc[i], + data->rdevs[i] =devm_regulator_register (dev, &info->reg_desc[i], &config);if (IS_ERR (rdev)) return dev_err_probe(dev, PTR_ERR(rdev),
base-commit: 9494c53e1389b120ba461899207ac8a3aab2632c
Signature · 1 line
2.37.3
PATCH v4 2/5 hwmon: (pmbus/core): Add interrupt support
From: Patrick Rudolph <[email protected]>
Implement PMBUS irq handler.
--- drivers/hwmon/pmbus/pmbus.h | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 89 ++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +1 -1
@@ -26,7 +26,7 @@ enum pmbus_regs {PMBUS_CAPABILITY =0x19 ,PMBUS_QUERY =0x1A , - +PMBUS_SMBALERT_MASK =0x1B ,PMBUS_VOUT_MODE =0x20 ,PMBUS_VOUT_COMMAND =0x21 , PMBUS_VOUT_TRIM = 0x22,
drivers/hwmon/pmbus/pmbus_core.c +89 -0
106 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH v4 3/5 hwmon: (pmbus/core): Notify hwmon events
In reply to Naresh SolankiNotify hwmon events using the pmbus irq handler.
--- drivers/hwmon/pmbus/pmbus_core.c | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +43 -3
@@ -2782,7 +2782,35 @@ static const struct pmbus_regulator_status_category pmbus_regulator_flag_map[] = }, }; -static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,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_regulator_get_flags (struct regulator_dev *rdev,unsigned int *error, +bool notify) {int i, status;const struct pmbus_regulator_status_category *cat;
@@ -2812,6 +2840,9 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsignedif (status & bit->pflag) *flags |= bit->rflag; } + +if (notify && status) +pmbus_notify (data, page, cat->reg, status); }/*
@@ -2856,6 +2887,11 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsignedreturn 0 ; } +static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) +{ +return pmbus_regulator_get_flags (rdev, flags, false); +} +static int pmbus_regulator_get_status (struct regulator_dev *rdev) {struct device *dev =rdev_get_dev (rdev);
@@ -3088,7 +3124,7 @@ 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, ret =IRQ_NONE , status;u8 page;for (i =0 ; i < data->info->num_regulators; i++) {
@@ -3096,6 +3132,10 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)if (!data->rdevs[i])continue ; + ret =pmbus_regulator_get_flags (data->rdevs[i], &status, true); +if (ret) +return ret; + page =rdev_get_id (data->rdevs[i]);mutex_lock (&data->update_lock); status =pmbus_read_status_word (client, page);
@@ -3110,7 +3150,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)mutex_unlock (&data->update_lock); } -return IRQ_HANDLED ; +return ret; }static int pmbus_irq_setup (struct i2c_client *client,struct pmbus_data *data)
Signature · 1 line
2.37.3
PATCH v4 4/5 hwmon: (pmbus/core): Add regulator event support
In reply to Naresh SolankiFrom: Patrick Rudolph <[email protected]>
Add regulator events corresponding to regulator error in regulator flag map.
Also capture the same in pmbus_regulator_get_flags.
--- drivers/hwmon/pmbus/pmbus_core.c | 85 ++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 31 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +54 -31
@@ -2739,9 +2739,9 @@ static int pmbus_regulator_disable(struct regulator_dev *rdev)return _pmbus_regulator_on_off (rdev,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_regulator_status_assoc { -int pflag, rflag; +int pflag, rflag, eflag; };/* PMBus->regulator bit mappings for a PMBus status register */
@@ -2756,27 +2756,36 @@ static const struct pmbus_regulator_status_category pmbus_regulator_flag_map[] = .func = PMBUS_HAVE_STATUS_VOUT, .reg = PMBUS_STATUS_VOUT, .bits = (const struct pmbus_regulator_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_regulator_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_regulator_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 }, { }, }, },
@@ -2810,7 +2819,7 @@ static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags) }static int pmbus_regulator_get_flags (struct regulator_dev *rdev,unsigned int *error, -bool notify) +unsigned int *event,bool notify) {int i, status;const struct pmbus_regulator_status_category *cat;
@@ -2821,7 +2830,8 @@ static int pmbus_regulator_get_flags(struct regulator_dev *rdev, unsigned int *eu8 page =rdev_get_id (rdev);int func = data->info->func[page]; - *flags =0 ; + *error =0 ; + *event =0 ;mutex_lock (&data->update_lock);
@@ -2836,10 +2846,11 @@ static int pmbus_regulator_get_flags(struct regulator_dev *rdev, unsigned int *ereturn status; } -for (bit = cat->bits; bit->pflag; bit++) { -if (status & bit->pflag) - *flags |= bit->rflag; - } +for (bit = cat->bits; bit->pflag; bit++) +if (status & bit->pflag) { + *error |= bit->rflag; + *event |= bit->eflag; + }if (notify && status)pmbus_notify (data, page, cat->reg, status);
@@ -2860,36 +2871,48 @@ static int pmbus_regulator_get_flags(struct regulator_dev *rdev, unsigned int *ereturn status;if (pmbus_regulator_is_enabled (rdev)) { -if (status &PB_STATUS_OFF ) - *flags |=REGULATOR_ERROR_FAIL ; +if (status &PB_STATUS_OFF ) { + *error |=REGULATOR_ERROR_FAIL ; + *event |=REGULATOR_EVENT_FAIL ; + } -if (status &PB_STATUS_POWER_GOOD_N ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; +if (status &PB_STATUS_POWER_GOOD_N ) { + *error |=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 ) - *flags |=REGULATOR_ERROR_OVER_CURRENT ; -if (status &PB_STATUS_VOUT_OV ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; +if (status &PB_STATUS_IOUT_OC ) { + *error |=REGULATOR_ERROR_OVER_CURRENT ; + *event |=REGULATOR_EVENT_OVER_CURRENT ; + } +if (status &PB_STATUS_VOUT_OV ) { + *error |=REGULATOR_ERROR_REGULATION_OUT ; + *event |=REGULATOR_EVENT_FAIL ; + }/* * If we haven't discovered any thermal faults or warnings via * PMBUS_STATUS_TEMPERATURE, map PB_STATUS_TEMPERATURE to a warning as * a (conservative) best-effort interpretation. */ -if (!(*flags & (REGULATOR_ERROR_OVER_TEMP |REGULATOR_ERROR_OVER_TEMP_WARN )) && - (status &PB_STATUS_TEMPERATURE )) - *flags |=REGULATOR_ERROR_OVER_TEMP_WARN ; +if (!(*error & (REGULATOR_ERROR_OVER_TEMP |REGULATOR_ERROR_OVER_TEMP_WARN )) && + (status &PB_STATUS_TEMPERATURE )) { + *error |=REGULATOR_ERROR_OVER_TEMP_WARN ; + *event |=REGULATOR_EVENT_OVER_TEMP_WARN ; + }return 0 ; }static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) { -return pmbus_regulator_get_flags (rdev, flags, false); +int event; + +return pmbus_regulator_get_flags (rdev, flags, &event, false); }static int pmbus_regulator_get_status (struct regulator_dev *rdev)
@@ -3124,7 +3147,7 @@ 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, ret =IRQ_NONE , status; +int i, ret =IRQ_NONE , status, event;u8 page;for (i =0 ; i < data->info->num_regulators; i++) {
@@ -3132,7 +3155,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)if (!data->rdevs[i])continue ; - ret =pmbus_regulator_get_flags (data->rdevs[i], &status, true); + ret =pmbus_regulator_get_flags (data->rdevs[i], &status, &event, true);if (ret)return ret;
Signature · 1 line
2.37.3
PATCH v4 5/5 hwmon: (pmbus/core): Notify regulator events
In reply to Naresh SolankiNotify regulator events in PMBus irq handler.
--- drivers/hwmon/pmbus/pmbus_core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +5 -0
@@ -3159,6 +3159,11 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)if (ret)return ret; +if (event) { +regulator_notifier_call_chain (data->rdevs[i], event,NULL ); + ret =IRQ_HANDLED ; + } + page =rdev_get_id (data->rdevs[i]);mutex_lock (&data->update_lock); status =pmbus_read_status_word (client, page);
Signature · 1 line
2.37.3