hwmon: (pmbus/core): Add rdev in pmbus_data struct
PATCH 1/3 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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +10 -5
@@ -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 */
@@ -3109,9 +3110,13 @@ static int pmbus_regulator_register(struct pmbus_data *data)struct device *dev = data->dev;const struct pmbus_driver_info *info = data->info;const struct pmbus_platform_data *pdata =dev_get_platdata (dev); -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 = { };
@@ -3121,10 +3126,10 @@ 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], - &config); -if (IS_ERR (rdev)) -return dev_err_probe (dev,PTR_ERR (rdev), + data->rdevs[i] =devm_regulator_register (dev, &info->reg_desc[i], + &config); +if (IS_ERR (data->rdevs[i])) +return dev_err_probe (dev,PTR_ERR (data->rdevs[i]),"Failed to register %s regulator\n" , info->reg_desc[i].name); }
base-commit: 8a863eb1b1162653d133856702e13560f3596b85
Signature · 1 line
2.39.1
PATCH 2/3 hwmon: (pmbus/core): Add regulator event support
From: 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 | 74 +++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 25 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +49 -25
@@ -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 *flagint 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 *flagif (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 *flagreturn 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,8 +2874,11 @@ 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 ; }
@@ -2864,10 +2886,10 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flagstatic int __maybe_unused pmbus_get_flags (struct pmbus_data *data,u8 page,unsigned int *flags,bool notify) { -int ret; +int ret, event;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, unsignedstruct 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);
Signature · 1 line
2.39.1
kernel test robot
build botRe: [PATCH 2/3] hwmon: (pmbus/core): Add regulator event support
I love your patch! Yet something to improve:
Hi Naresh,
I love your patch! Yet something to improve:
[auto build test ERROR on 8a863eb1b1162653d133856702e13560f3596b85]
url: https://github.com/intel-lab-lkp/linux/commits/Naresh-Solanki/hwmon-pmbus-core-Add-regulator-event-support/20230328-201831 base: 8a863eb1b1162653d133856702e13560f3596b85 patch link: https://lore.kernel.org/r/20230328121712.4057359-2-Naresh.Solanki%409elements.com patch subject: [PATCH 2/3] hwmon: (pmbus/core): Add regulator event support config: riscv-allmodconfig (https://download.01.org/0day-ci/archive/20230328/[email protected]/config) compiler: riscv64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/bc5ab0ded8947e49f5292c04bf381274a0272f3f
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Naresh-Solanki/hwmon-pmbus-core-Add-regulator-event-support/20230328-201831 git checkout bc5ab0ded8947e49f5292c04bf381274a0272f3f
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=riscv olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash drivers/hwmon/pmbus/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
drivers/hwmon/pmbus/pmbus_core.c: In function 'pmbus_regulator_get_error_flags':
>> drivers/hwmon/pmbus/pmbus_core.c:2938:9: warning: the address of 'event' will always evaluate as 'true' [-Waddress]
2938 | return pmbus_get_flags(data, rdev_get_id(rdev), flags, &event, false);
| ^~~~~~
>> drivers/hwmon/pmbus/pmbus_core.c:2938:16: error: too many arguments to function 'pmbus_get_flags'
2938 | return pmbus_get_flags(data, rdev_get_id(rdev), flags, &event, false);
| ^~~~~~~~~~~~~~~ drivers/hwmon/pmbus/pmbus_core.c:2886:27: note: declared here
2886 | static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags,
| ^~~~~~~~~~~~~~~
vim +/pmbus_get_flags +2938 drivers/hwmon/pmbus/pmbus_core.c
2930
2931 static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned int *flags)
2932 {
2933 struct device *dev = rdev_get_dev(rdev);
2934 struct i2c_client *client = to_i2c_client(dev->parent);
2935 struct pmbus_data *data = i2c_get_clientdata(client);
2936 int event;
2937
> 2938 return pmbus_get_flags(data, rdev_get_id(rdev), flags, &event, false);
2939 }
2940
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH 3/3 hwmon: (pmbus/core): Notify regulator events
In reply to Naresh SolankiNotify regulator events in PMBus irq handler.
--- drivers/hwmon/pmbus/pmbus_core.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus_core.c +23 -1
@@ -3159,11 +3159,29 @@ static int pmbus_regulator_register(struct pmbus_data *data) return 0; } + +static int pmbus_regulator_notify (struct pmbus_data *data,int page,int event) +{ +int j; + +for (j =0 ; j < data->info->num_regulators; j++) { +if (page ==rdev_get_id (data->rdevs[j])) { +regulator_notifier_call_chain (data->rdevs[j], event,NULL ); +break ; + } + } +return 0 ; +}#else static int pmbus_regulator_register (struct pmbus_data *data) {return 0 ; } + +static int pmbus_regulator_notify (struct pmbus_data *data,int page,int event) +{ +return 0 ; +}#endif static int pmbus_write_smbalert_mask (struct i2c_client *client,u8 page,u8 reg,u8 val)
@@ -3178,9 +3196,13 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)int i, status, event;mutex_lock (&data->update_lock); -for (i =0 ; i < data->info->pages; i++) +for (i =0 ; i < data->info->pages; i++) {_pmbus_get_flags (data, i, &status, &event, true); +if (event) +pmbus_regulator_notify (data, i, event); + } +pmbus_clear_faults (client);mutex_unlock (&data->update_lock);
Signature · 1 line
2.39.1