hwmon: (pmbus/core): Generalize pmbus status flag map
PATCH 1/4 hwmon: (pmbus/core): Generalize pmbus status flag map
The PMBus status flag map(pmbus_regulator_status_flag_map) is moved outside of the regulator #if block and the associated variable/struct name updated to reflect as generic PMBus status.
This will make the PMBus status flag map more versatile and easier to incorporate into different contexts and functions.
--- drivers/hwmon/pmbus/pmbus_core.c | 94 ++++++++++++++++---------------- 1 file changed, 47 insertions(+), 47 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +47 -47
@@ -2692,6 +2692,49 @@ 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 */ +struct pmbus_status_assoc { +int pflag, rflag; +}; + +/* PMBus->regulator bit mappings for a PMBus status register */ +struct pmbus_status_category { +int func; +int reg; +const struct pmbus_status_assoc *bits;/* zero-terminated */ +}; + +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 }, + { }, + }, + }, { + .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 }, + { }, + }, + }, { + .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 }, + { }, + }, + }, +}; +#if IS_ENABLED (CONFIG_REGULATOR )static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) {
@@ -2738,54 +2781,11 @@ 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 */ -struct pmbus_regulator_status_assoc { -int pflag, rflag; -}; - -/* PMBus->regulator bit mappings for a PMBus status register */ -struct pmbus_regulator_status_category { -int func; -int reg; -const struct pmbus_regulator_status_assoc *bits;/* zero-terminated */ -}; - -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 }, - { }, - }, - }, { - .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 }, - { }, - }, - }, { - .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 }, - { }, - }, - }, -}; -static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) {int i, status; -const struct pmbus_regulator_status_category *cat; -const struct pmbus_regulator_status_assoc *bit; +const struct pmbus_status_category *cat; +const struct pmbus_status_assoc *bit;struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent);struct pmbus_data *data =i2c_get_clientdata (client);
@@ -2796,8 +2796,8 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsignedmutex_lock (&data->update_lock); -for (i =0 ; i <ARRAY_SIZE (pmbus_regulator_flag_map); i++) { - cat = &pmbus_regulator_flag_map[i]; +for (i =0 ; i <ARRAY_SIZE (pmbus_status_flag_map); i++) { + cat = &pmbus_status_flag_map[i];if (!(func & cat->func))continue ;
base-commit: 4d891f76a30d3be4194a805c5e4277786140ef05
Signature · 1 line
2.38.1
PATCH 2/4 hwmon: (pmbus/core) Generalise pmbus get status
Add function pmbus get status that can be used to get both pmbus specific status & regulator status
--- drivers/hwmon/pmbus/pmbus_core.c | 148 +++++++++++++++++-------------- 1 file changed, 82 insertions(+), 66 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +82 -66
@@ -2735,64 +2735,16 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] }, }; -#if IS_ENABLED (CONFIG_REGULATOR ) -static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) -{ -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; -mutex_lock (&data->update_lock); - ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); -mutex_unlock (&data->update_lock); - -if (ret <0 ) -return ret; - -return !!(ret &PB_OPERATION_CONTROL_ON ); -} - -static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +static int pmbus_get_flags (struct pmbus_data *data,u8 page,unsigned int *error) { -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; - -mutex_lock (&data->update_lock); - ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); -mutex_unlock (&data->update_lock); - -return ret; -} - -static int pmbus_regulator_enable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,1 ); -} - -static int pmbus_regulator_disable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,0 ); -} - -static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) -{ -int i, status;const struct pmbus_status_category *cat;const struct pmbus_status_assoc *bit; -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); +struct i2c_client *client =to_i2c_client (data->dev);int func = data->info->func[page]; +int i, status, ret; - *flags =0 ; + *error =0 ;mutex_lock (&data->update_lock);
@@ -2803,14 +2755,15 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned status =_pmbus_read_byte_data (client, page, cat->reg);if (status <0 ) { -mutex_unlock (&data->update_lock); -return status; + ret = status; + goto unlock; }for (bit = cat->bits; bit->pflag; bit++) {if (status & bit->pflag) - *flags |= bit->rflag; + *error |= bit->rflag; } + }/*
@@ -2823,36 +2776,99 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned* REGULATOR_ERROR_<foo>_WARN. */ status =pmbus_get_status (client, page,PMBUS_STATUS_WORD ); -mutex_unlock (&data->update_lock); -if (status <0 ) -return status; -if (pmbus_regulator_is_enabled (rdev)) { +if (status <0 ) { + ret = status; + goto unlock; + } + + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +if (ret <0 ) + goto unlock; + +if (ret &PB_OPERATION_CONTROL_ON ) {if (status &PB_STATUS_OFF ) - *flags |=REGULATOR_ERROR_FAIL ; + *error |=REGULATOR_ERROR_FAIL ;if (status &PB_STATUS_POWER_GOOD_N ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_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 ; + *error |=REGULATOR_ERROR_OVER_CURRENT ;if (status &PB_STATUS_VOUT_OV ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_REGULATION_OUT ;/* * 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 )) && +if (!(*error & (REGULATOR_ERROR_OVER_TEMP |REGULATOR_ERROR_OVER_TEMP_WARN )) && (status &PB_STATUS_TEMPERATURE )) - *flags |=REGULATOR_ERROR_OVER_TEMP_WARN ; + *error |=REGULATOR_ERROR_OVER_TEMP_WARN ; -return 0 ; +unlock: +mutex_unlock (&data->update_lock); +return ret; +} + +#if IS_ENABLED (CONFIG_REGULATOR ) +static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); + +if (ret <0 ) +return ret; + +return !!(ret &PB_OPERATION_CONTROL_ON ); +} + +static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; +} + +static int pmbus_regulator_enable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,1 ); +} + +static int pmbus_regulator_disable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,0 ); +} + +static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) +{ +struct device *dev =rdev_get_dev (rdev); +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); }static int pmbus_regulator_get_status (struct regulator_dev *rdev)
Signature · 1 line
2.38.1
Guenter Roeck
maintainerRe: [PATCH 2/4] hwmon: (pmbus/core) Generalise pmbus get status
Quoted 27 lines · Naresh Solanki
Add function pmbus get status that can be used to get both pmbus specific status & regulator status
Signed-off-by Naresh Solanki <[email protected]>--- drivers/hwmon/pmbus/pmbus_core.c | 148 +++++++++++++++++-------------- 1 file changed, 82 insertions(+), 66 deletions(-)drivers/hwmon/pmbus/pmbus_core.c +0
-10@@ -2735,64 +2735,16 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] }, }; -#if IS_ENABLED (CONFIG_REGULATOR ) -static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) -{ -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; -mutex_lock (&data->update_lock); - ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION );
drivers/hwmon/pmbus/pmbus_core.c static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] · line 2739
Quoted 10 lines
drivers/hwmon/pmbus/pmbus_core.c +1
-9-mutex_unlock (&data->update_lock); - -if (ret <0 ) -return ret; - -return !!(ret &PB_OPERATION_CONTROL_ON ); -} - -static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +static int pmbus_get_flags (struct pmbus_data *data,u8 page,unsigned int *error)
Moving this code outside the conditional without usage there will result in compile errors due to an unused function if compiled with REGULATOR disabled. While this will (hopefully) change in one of the later patches, it is still unacceptable because it may result in bisect failures.
Quoted 31 lines
drivers/hwmon/pmbus/pmbus_core.c +0
-28{ -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; - -mutex_lock (&data->update_lock); - ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); -mutex_unlock (&data->update_lock); - -return ret; -} - -static int pmbus_regulator_enable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,1 ); -} - -static int pmbus_regulator_disable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,0 ); -} - -static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) -{ -int i, status;const struct pmbus_status_category *cat;const struct pmbus_status_assoc *bit;
drivers/hwmon/pmbus/pmbus_core.c static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] · line 2747
Quoted 10 lines
drivers/hwmon/pmbus/pmbus_core.c +3
-5-struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); +struct i2c_client *client =to_i2c_client (data->dev);int func = data->info->func[page]; +int i, status, ret; - *flags =0 ; + *error =0 ;
You are making personal preference changes here. Maybe that is the reason why the patch looks that large. Please try to leave existing code alone. If there is a reason to change a variable name (or other cosmetic changes, like moving variable declarations around), do it in a separate patch which only does that, and explain why it is needed and/or makes sense.
Thanks,
Guenter
Quoted 136 lines
drivers/hwmon/pmbus/pmbus_core.c +78
-14mutex_lock (&data->update_lock);@@ -2803,14 +2755,15 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned status =_pmbus_read_byte_data (client, page, cat->reg);if (status <0 ) { -mutex_unlock (&data->update_lock); -return status; + ret = status; + goto unlock; }for (bit = cat->bits; bit->pflag; bit++) {if (status & bit->pflag) - *flags |= bit->rflag; + *error |= bit->rflag; } + }/* @@ -2823,36 +2776,99 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned* REGULATOR_ERROR_<foo>_WARN. */ status =pmbus_get_status (client, page,PMBUS_STATUS_WORD ); -mutex_unlock (&data->update_lock); -if (status <0 ) -return status; -if (pmbus_regulator_is_enabled (rdev)) { +if (status <0 ) { + ret = status; + goto unlock; + } + + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +if (ret <0 ) + goto unlock; + +if (ret &PB_OPERATION_CONTROL_ON ) {if (status &PB_STATUS_OFF ) - *flags |=REGULATOR_ERROR_FAIL ; + *error |=REGULATOR_ERROR_FAIL ;if (status &PB_STATUS_POWER_GOOD_N ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_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 ; + *error |=REGULATOR_ERROR_OVER_CURRENT ;if (status &PB_STATUS_VOUT_OV ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_REGULATION_OUT ;/* * 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 )) && +if (!(*error & (REGULATOR_ERROR_OVER_TEMP |REGULATOR_ERROR_OVER_TEMP_WARN )) && (status &PB_STATUS_TEMPERATURE )) - *flags |=REGULATOR_ERROR_OVER_TEMP_WARN ; + *error |=REGULATOR_ERROR_OVER_TEMP_WARN ; -return 0 ; +unlock: +mutex_unlock (&data->update_lock); +return ret; +} + +#if IS_ENABLED (CONFIG_REGULATOR ) +static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); + +if (ret <0 ) +return ret; + +return !!(ret &PB_OPERATION_CONTROL_ON ); +} + +static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; +} + +static int pmbus_regulator_enable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,1 ); +} + +static int pmbus_regulator_disable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,0 ); +} + +static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) +{ +struct device *dev =rdev_get_dev (rdev); +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); }static int pmbus_regulator_get_status (struct regulator_dev *rdev)Signature · 1 line
2.38.1
Re: [PATCH 2/4] hwmon: (pmbus/core) Generalise pmbus get status
Hi
Quoted 35 lines · Guenter Roeck
Quoted 34 lines · Naresh Solanki
Add function pmbus get status that can be used to get both pmbus specific status & regulator status
Signed-off-by Naresh Solanki <[email protected]>--- drivers/hwmon/pmbus/pmbus_core.c | 148 +++++++++++++++++-------------- 1 file changed, 82 insertions(+), 66 deletions(-)drivers/hwmon/pmbus/pmbus_core.c +0
-17@@ -2735,64 +2735,16 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] }, }; -#if IS_ENABLED (CONFIG_REGULATOR ) -static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) -{ -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; -mutex_lock (&data->update_lock); - ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); -mutex_unlock (&data->update_lock); - -if (ret <0 ) -return ret; - -return !!(ret &PB_OPERATION_CONTROL_ON ); -}
Quoted 9 lines
drivers/hwmon/pmbus/pmbus_core.c static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] · line 2739
Quoted 3 lines
drivers/hwmon/pmbus/pmbus_core.c +1
-2- -static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +static int pmbus_get_flags (struct pmbus_data *data,u8 page,unsigned int *error)Moving this code outside the conditional without usage there will result in compile errors due to an unused function if compiled with REGULATOR disabled. While this will (hopefully) change in one of the later patches, it is still unacceptable because it may result in bisect failures.
Yes. With REGULATOR disabled. There is warning:
warning: ‘pmbus_get_flags’ defined but not used [-Wunused-function]
2739 | static int pmbus_get_flags(struct pmbus_data *data, u8 page,
unsigned int *error)
Will add maybe unused as below:
static int __maybe_unused pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error)
Let me know your view.
Quoted 39 lines
Quoted 39 lines
drivers/hwmon/pmbus/pmbus_core.c +2
-32{ -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); -int ret; - -mutex_lock (&data->update_lock); - ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); -mutex_unlock (&data->update_lock); - -return ret; -} - -static int pmbus_regulator_enable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,1 ); -} - -static int pmbus_regulator_disable (struct regulator_dev *rdev) -{ -return _pmbus_regulator_on_off (rdev,0 ); -} - -static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) -{ -int i, status;const struct pmbus_status_category *cat;const struct pmbus_status_assoc *bit; -struct device *dev =rdev_get_dev (rdev); -struct i2c_client *client =to_i2c_client (dev->parent); -struct pmbus_data *data =i2c_get_clientdata (client); -u8 page =rdev_get_id (rdev); +struct i2c_client *client =to_i2c_client (data->dev);int func = data->info->func[page]; +int i, status, ret;
Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] · line 2747
Quoted 2 lines
drivers/hwmon/pmbus/pmbus_core.c +1
-1- *flags =0 ; + *error =0 ;You are making personal preference changes here. Maybe that is the reason why the patch looks that large. Please try to leave existing code alone. If there is a reason to change a variable name (or other cosmetic changes, like moving variable declarations around), do it in a separate patch which only does that, and explain why it is needed and/or makes sense.
Sure. Will do.
Best Regards,
Naresh
Quoted 140 lines
Thanks,
GuenterQuoted 136 lines
drivers/hwmon/pmbus/pmbus_core.c +78
-14mutex_lock (&data->update_lock);@@ -2803,14 +2755,15 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned status =_pmbus_read_byte_data (client, page, cat->reg);if (status <0 ) { -mutex_unlock (&data->update_lock); -return status; + ret = status; + goto unlock; }for (bit = cat->bits; bit->pflag; bit++) {if (status & bit->pflag) - *flags |= bit->rflag; + *error |= bit->rflag; } + }/* @@ -2823,36 +2776,99 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned* REGULATOR_ERROR_<foo>_WARN. */ status =pmbus_get_status (client, page,PMBUS_STATUS_WORD ); -mutex_unlock (&data->update_lock); -if (status <0 ) -return status; -if (pmbus_regulator_is_enabled (rdev)) { +if (status <0 ) { + ret = status; + goto unlock; + } + + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +if (ret <0 ) + goto unlock; + +if (ret &PB_OPERATION_CONTROL_ON ) {if (status &PB_STATUS_OFF ) - *flags |=REGULATOR_ERROR_FAIL ; + *error |=REGULATOR_ERROR_FAIL ;if (status &PB_STATUS_POWER_GOOD_N ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_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 ; + *error |=REGULATOR_ERROR_OVER_CURRENT ;if (status &PB_STATUS_VOUT_OV ) - *flags |=REGULATOR_ERROR_REGULATION_OUT ; + *error |=REGULATOR_ERROR_REGULATION_OUT ;/* * 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 )) && +if (!(*error & (REGULATOR_ERROR_OVER_TEMP |REGULATOR_ERROR_OVER_TEMP_WARN )) && (status &PB_STATUS_TEMPERATURE )) - *flags |=REGULATOR_ERROR_OVER_TEMP_WARN ; + *error |=REGULATOR_ERROR_OVER_TEMP_WARN ; -return 0 ; +unlock: +mutex_unlock (&data->update_lock); +return ret; +} + +#if IS_ENABLED (CONFIG_REGULATOR ) +static int pmbus_regulator_is_enabled (struct regulator_dev *rdev) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =_pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); + +if (ret <0 ) +return ret; + +return !!(ret &PB_OPERATION_CONTROL_ON ); +} + +static int _pmbus_regulator_on_off (struct regulator_dev *rdev,bool enable) +{ +struct device *dev =rdev_get_dev (rdev); +struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client); +u8 page =rdev_get_id (rdev); +int ret; + +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; +} + +static int pmbus_regulator_enable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,1 ); +} + +static int pmbus_regulator_disable (struct regulator_dev *rdev) +{ +return _pmbus_regulator_on_off (rdev,0 ); +} + +static int pmbus_regulator_get_error_flags (struct regulator_dev *rdev,unsigned int *flags) +{ +struct device *dev =rdev_get_dev (rdev); +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); }static int pmbus_regulator_get_status (struct regulator_dev *rdev)Signature · 1 line
2.38.1
PATCH 3/4 hwmon: (pmbus/core): Add interrupt support
In reply to Naresh SolankiFrom: Patrick Rudolph <[email protected]>
Implement PMBUS irq handler.
--- drivers/hwmon/pmbus/pmbus.h | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 85 ++++++++++++++++++++++++++++++++ 2 files changed, 86 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 +85 -0
97 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH 4/4 hwmon: (pmbus/core): Notify hwmon events
In reply to Naresh SolankiNotify hwmon events using the pmbus irq handler.
--- drivers/hwmon/pmbus/pmbus_core.c | 45 ++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 5 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +40 -5
@@ -2735,8 +2735,35 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] }, }; +#define to_dev_attr (_dev_attr) \ + container_of(_dev_attr, struct device_attribute, attr) -static int pmbus_get_flags (struct pmbus_data *data,u8 page,unsigned int *error) +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 *error, +bool notify) {const struct pmbus_status_category *cat;const struct pmbus_status_assoc *bit;
@@ -2764,6 +2791,8 @@ static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error *error |= bit->rflag; } +if (notify && status) +pmbus_notify (data, page, cat->reg, status); }/*
@@ -2868,7 +2897,7 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsignedstruct 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)
@@ -3110,10 +3139,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; + +mutex_lock (&data->update_lock); status =pmbus_read_status_word (client, i);if (status <0 ) {mutex_unlock (&data->update_lock);
@@ -3122,8 +3155,10 @@ 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); } -mutex_unlock (&data->update_lock); +return IRQ_HANDLED ; }
Signature · 1 line
2.38.1