hwmon: (pmbus/adm1275) Protect writes to PMON_CONFIG
Guenter Roeck
maintainercover hwmon: (pmbus/adm1275) Protect writes to PMON_CONFIG
According to ADI, changing PMON_CONFIG while ADC is running can have unexpected results. ADI recommends halting the ADC with PMON_CONTROL before setting PMON_CONFIG and then resume after.
The first patch of the series cleans up the code to prepare for the functional change. The second patch implements stopping the ADC while writing into PMON_CONFIG.
This series depends on patch 'hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272' submitted earlier at
https://patchwork.kernel.org/project/linux-hwmon/patch/[email protected]/
Guenter Roeck
maintainerPATCH 1/2 hwmon: (pmbus/adm1275) Prepare for protected write to PMON_CONFIG
According to ADI, changing PMON_CONFIG while ADC is running can have unexpected results. ADI recommends halting the ADC with PMON_CONTROL before setting PMON_CONFIG and then resume after.
To prepare for this change, rename adm1275_read_pmon_config() and adm1275_write_pmon_config() to adm1275_read_samples() and adm1275_write_samples() to more accurately reflect the functionality of the code. Introduce new function adm1275_write_pmon_config() and use it for all code writing into the PMON_CONFIG register.
--- drivers/hwmon/pmbus/adm1275.c | 56 +++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 25 deletions(-)
drivers/hwmon/pmbus/adm1275.c +31 -25
@@ -173,8 +173,8 @@ static const struct coefficients adm1293_coefficients[] = { [18] = { 7658, 0, -3 }, /* power, 21V, irange200 */ }; -static int adm1275_read_pmon_config (const struct adm1275_data *data, -struct i2c_client *client,bool is_power) +static int adm1275_read_samples (const struct adm1275_data *data, +struct i2c_client *client,bool is_power) {int shift, ret;u16 mask;
@@ -200,8 +200,23 @@ static int adm1275_read_pmon_config(const struct adm1275_data *data, }static int adm1275_write_pmon_config (const struct adm1275_data *data, -struct i2c_client *client, -bool is_power,u16 word) +struct i2c_client *client,u16 word) +{ +int ret; + +if (data->have_power_sampling) + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , + word); +else + ret =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONFIG , + word); + +return ret; +} + +static int adm1275_write_samples (const struct adm1275_data *data, +struct i2c_client *client, +bool is_power,u16 word) {int shift, ret;u16 mask;
@@ -219,14 +234,8 @@ static int adm1275_write_pmon_config(const struct adm1275_data *data,return ret; word = (ret & ~mask) | ((word << shift) & mask); -if (data->have_power_sampling) - ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , - word); -else - ret =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONFIG , - word); -return ret; +return adm1275_write_pmon_config (data, client, word); } static int adm1275_read_word_data(struct i2c_client *client, int page,
@@ -321,14 +330,14 @@ static int adm1275_read_word_data(struct i2c_client *client, int page,case PMBUS_VIRT_POWER_SAMPLES :if (!data->have_power_sampling)return -ENXIO ; - ret =adm1275_read_pmon_config (data, client, true); + ret =adm1275_read_samples (data, client, true);if (ret <0 )break ; ret =BIT (ret);break ;case PMBUS_VIRT_IN_SAMPLES :case PMBUS_VIRT_CURR_SAMPLES : - ret =adm1275_read_pmon_config (data, client, false); + ret =adm1275_read_samples (data, client, false);if (ret <0 )break ; ret =BIT (ret);
@@ -381,14 +390,12 @@ static int adm1275_write_word_data(struct i2c_client *client, int page, int reg,if (!data->have_power_sampling)return -ENXIO ; word =clamp_val (word,1 ,ADM1275_SAMPLES_AVG_MAX ); - ret =adm1275_write_pmon_config (data, client, true, -ilog2 (word)); + ret =adm1275_write_samples (data, client, true,ilog2 (word));break ;case PMBUS_VIRT_IN_SAMPLES :case PMBUS_VIRT_CURR_SAMPLES : word =clamp_val (word,1 ,ADM1275_SAMPLES_AVG_MAX ); - ret =adm1275_write_pmon_config (data, client, false, -ilog2 (word)); + ret =adm1275_write_samples (data, client, false,ilog2 (word));break ;default : ret = -ENODATA ;
@@ -466,13 +473,14 @@ static const struct i2c_device_id adm1275_id[] = {MODULE_DEVICE_TABLE (i2c, adm1275_id);/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ -static int adm1275_enable_vout_temp (struct i2c_client *client,int config) +static int adm1275_enable_vout_temp (struct adm1275_data *data, +struct i2c_client *client,int config) {int ret;if ((config &ADM1278_PMON_DEFCONFIG ) !=ADM1278_PMON_DEFCONFIG ) { config |=ADM1278_PMON_DEFCONFIG ; - ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config); + ret =adm1275_write_pmon_config (data, client, config);if (ret <0 ) {dev_err (&client->dev,"Failed to enable VOUT/TEMP1 monitoring\n" );return ret;
@@ -634,7 +642,7 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; - ret =adm1275_enable_vout_temp (client, config); + ret =adm1275_enable_vout_temp (data, client, config);if (ret)return ret;
@@ -694,7 +702,7 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; - ret =adm1275_enable_vout_temp (client, config); + ret =adm1275_enable_vout_temp (data, client, config);if (ret)return ret;
@@ -766,8 +774,7 @@ static int adm1275_probe(struct i2c_client *client) "Invalid number of power samples");return -EINVAL ; } - ret =adm1275_write_pmon_config (data, client, true, -ilog2 (avg)); + ret =adm1275_write_samples (data, client, true,ilog2 (avg));if (ret <0 ) { dev_err(&client->dev, "Setting power sample averaging failed with error %d",
@@ -784,8 +791,7 @@ static int adm1275_probe(struct i2c_client *client) "Invalid number of voltage/current samples");return -EINVAL ; } - ret =adm1275_write_pmon_config (data, client, false, -ilog2 (avg)); + ret =adm1275_write_samples (data, client, false,ilog2 (avg));if (ret <0 ) { dev_err(&client->dev, "Setting voltage and current sample averaging failed with error %d",
Signature · 1 line
2.39.2
Guenter Roeck
maintainerPATCH 2/2 hwmon: (pmbus/adm1275) Disable ADC while updating PMON_CONFIG
In reply to Guenter RoeckAccording to ADI, changing PMON_CONFIG while the ADC is running can have unexpected results. ADI recommends halting the ADC with PMON_CONTROL before setting PMON_CONFIG and then resume after. Follow ADI recommendation and disable ADC while PMON_CONFIG is updated.
--- drivers/hwmon/pmbus/adm1275.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1275.c +17 -1
@@ -27,8 +27,11 @@ enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1293, adm1294 };#define ADM1275_PEAK_IOUT 0xd0#define ADM1275_PEAK_VIN 0xd1#define ADM1275_PEAK_VOUT 0xd2 +#define ADM1275_PMON_CONTROL 0xd3#define ADM1275_PMON_CONFIG 0xd4 +#define ADM1275_CONVERT_EN BIT(0) +#define ADM1275_VIN_VOUT_SELECT BIT(6)#define ADM1275_VRANGE BIT(5)#define ADM1075_IRANGE_50 BIT(4)
@@ -202,7 +205,11 @@ static int adm1275_read_samples(const struct adm1275_data *data,static int adm1275_write_pmon_config (const struct adm1275_data *data,struct i2c_client *client,u16 word) { -int ret; +int ret, ret2; + + ret =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONTROL ,0 ); +if (ret) +return ret;if (data->have_power_sampling) ret = i2c_smbus_write_word_data(client, ADM1275_PMON_CONFIG,
@@ -211,6 +218,15 @@ static int adm1275_write_pmon_config(const struct adm1275_data *data, ret =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONFIG , word); +/* +* We still want to re-enable conversions if writing into +* ADM1275_PMON_CONFIG failed. +*/ + ret2 =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONTROL , +ADM1275_CONVERT_EN ); +if (!ret) + ret = ret2; +return ret; }
Signature · 1 line
2.39.2