hwmon: (ina2xx) implement update_interval attribute for ina226
Subsystems (2)
PATCH 1/1 hwmon: (ina2xx) implement update_interval attribute for ina226
This attribute allows to configure the update interval of ina226. Although the bus and shunt voltage conversion times remain hardcoded to 1.1 ms, we can now modify said interval by changing the averaging rate.
While we're at it - add an additional variable to ina2xx_data, which holds the current configuration settings - this way we'll be able to restore the configuration in case of an unexpected chip reset.
--- Documentation/hwmon/ina2xx | 3 + drivers/hwmon/ina2xx.c | 133 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 132 insertions(+), 4 deletions(-)
Documentation/hwmon/ina2xx +3 -0
@@ -48,3 +48,6 @@ The shunt value in micro-ohms can be set via platform data or device tree at compile-time or via the shunt_resistor attribute in sysfs at run-time. Please refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings if the device tree is used. + +Additionally ina226 supports update_interval attribute as described in +Documentation/hwmon/sysfs-interface.
drivers/hwmon/ina2xx.c +129 -4
200 lines not on this page · raw message
Signature · 7 lines
2.1.3 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerQuoted 19 lines · Bartosz Golaszewski
This attribute allows to configure the update interval of ina226. Although the bus and shunt voltage conversion times remain hardcoded to 1.1 ms, we can now modify said interval by changing the averaging rate.
While we're at it - add an additional variable to
ina2xx_data, which holds the current configuration settings - this way we'll be able to restore the configuration in case of an unexpected chip reset.Signed-off-by Bartosz Golaszewski <[email protected]>--- Documentation/hwmon/ina2xx | 3 + drivers/hwmon/ina2xx.c | 133 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 132 insertions(+), 4 deletions(-)Documentation/hwmon/ina2xx +0
-0
Documentation/hwmon/ina2xx The shunt value in micro-ohms can be set via platform data or device tree at · line 53
Quoted 6 lines
Documentation/hwmon/ina2xx +3
-0@@ -48,3 +48,6 @@ The shunt value in micro-ohms can be set via platform data or device tree at compile-time or via the shunt_resistor attribute in sysfs at run-time. Please refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings if the device tree is used. + +Additionally ina226 supports update_interval attribute as described in +Documentation/hwmon/sysfs-interface.
Hi Bartosz,
A more detailed explanation, describing how the update interval translates to the number of averages, would be helpful.
Quoted 65 lines
drivers/hwmon/ina2xx.c +37
-0@@ -68,6 +68,21 @@#define INA2XX_RSHUNT_DEFAULT 10000 +/* bit mask for reading the averaging setting in the configuration register */ +#define INA226_AVG_RD_MASK 0x0E00 + +#define INA226_READ_AVG (reg) (((reg) & INA226_AVG_RD_MASK) >> 9) +#define INA226_SHIFT_AVG (val) ((val) << 9) + +/* common attrs, ina226 attrs and NULL */ +#define INA2XX_MAX_ATTRIBUTE_GROUPS 3 + +/* +* Both bus voltage and shunt voltage conversion times for ina226 are set +* to 0b0100 on POR, which translates to 1100 microseconds. +*/ +#define INA226_CONV_TIME_DEFAULT 1100 +enum ina2xx_ids { ina219, ina226 };struct ina2xx_config {@@ -85,12 +100,14 @@ struct ina2xx_data {const struct ina2xx_config *config;long rshunt; +u16 curr_config;struct mutex update_lock;bool valid;unsigned long last_updated;int kind; +const struct attribute_group *groups[INA2XX_MAX_ATTRIBUTE_GROUPS ];u16 regs[INA2XX_MAX_REGISTERS ]; };@@ -115,6 +132,48 @@ static const struct ina2xx_config ina2xx_config[] = { }, }; +/* +* Available averaging rates for ina226. The indices correspond with +* the bit values expected by the chip (according to the ina226 datasheet, +* table 3 AVG bit settings, found at +* http://www.ti.com/lit/ds/symlink/ina226.pdf. +*/ +static const int ina226_avg_tab[] = {1 ,4 ,16 ,64 ,128 ,256 ,512 ,1024 }; + +static int ina226_avg_bits (int avg) +{ +int i; + +/* Get the closest average from the tab. */ +for (i =0 ; i <ARRAY_SIZE (ina226_avg_tab) -1 ; i++) { +if (avg <= (ina226_avg_tab[i] + ina226_avg_tab[i +1 ]) /2 ) +break ; + } + +return i;/* Return 0b0111 for values greater than 1024. */ +}
drivers/hwmon/ina2xx.c static const struct ina2xx_config ina2xx_config[] = { · line 164
Quoted 10 lines
drivers/hwmon/ina2xx.c +10
-0+ +static int ina226_reg_to_interval (u16 config) +{ +int avg = ina226_avg_tab[INA226_READ_AVG (config)]; + +/* +* Add bus and shunt voltage conversion times and multiple them +* by the averaging rate. Return the result in milliseconds. +*/ +return (avg *2 *INA226_CONV_TIME_DEFAULT ) /1000 ;
What is the purpose of multiplying the calculated average by 2 ?
Using DIV_ROUND_CLOSEST() might be a better choice to reduce rounding errors.
drivers/hwmon/ina2xx.c static const struct ina2xx_config ina2xx_config[] = { · line 171
Quoted 7 lines
drivers/hwmon/ina2xx.c +7
-0+} + +static u16 ina226_interval_to_reg (int interval,u16 config) +{ +int avg, avg_bits; + + avg = (interval *1000 ) / (2 *INA226_CONV_TIME_DEFAULT );
Another multiplication by 2 without explanation.
Using DIV_ROUND_CLOSEST() might be a better choice.
You should use the actual update interval in ina2xx_update_device(), since it no longer makes sense to use the static 'HZ / INA2XX_CONVERSION_RATE'.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
2015-01-08 18:05 GMT+01:00 Guenter Roeck <[email protected]>:
Quoted 1 line
What is the purpose of multiplying the calculated average by 2 ?
The comment above says:
drivers/hwmon/ina2xx.c static const struct ina2xx_config ina2xx_config[] = { · line 163
Quoted 4 lines
drivers/hwmon/ina2xx.c +4
-0+/* +* Add bus and shunt voltage conversion times and multiple them +* by the averaging rate. Return the result in milliseconds. +*/
Since both conversion times are the same and equal INA226_CONV_TIME_DEFAULT I just multiplied it by 2 - I thought it was clear enough. I'll fix that in the next iteration.
Bart
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerQuoted 5 lines · Bartosz Golaszewski
2015-01-08 18:05 GMT+01:00 Guenter Roeck <[email protected]>:
Quoted 1 line
What is the purpose of multiplying the calculated average by 2 ?
The comment above says:
Quoted 9 lines
drivers/hwmon/ina2xx.c static const struct ina2xx_config ina2xx_config[] = { · line 163
Quoted 4 lines
drivers/hwmon/ina2xx.c +4
-0+/* +* Add bus and shunt voltage conversion times and multiple them +* by the averaging rate. Return the result in milliseconds. +*/ Since both conversion times are the same and equal
INA226_CONV_TIME_DEFAULTI just multiplied it by 2 - I thought it was clear enough. I'll fix that in the next iteration.
Sorry, still don't get it. I must be a bit slow today ;-)
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors