pda_power: add support for writeable properties
PATCH 1/3 pda_power: add support for writeable properties
This patch adds support for writeable power supply properties and exposes them as writeable to sysfs.
A power supply implementation must implement two new function calls in order to use that feature:
int set_property(struct power_supply *psy,
enum power_supply_property psp, const union power_supply_propval *val);
int property_is_writeable(struct power_supply *psy,
enum power_supply_property psp);
--- drivers/power/power_supply_sysfs.c | 31 +++++++++++++++++++++++++++++-- include/linux/power_supply.h | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-)
drivers/power/power_supply_sysfs.c +29 -2
@@ -31,9 +31,9 @@#define POWER_SUPPLY_ATTR (_name) \ { \ - .attr = { .name = #_name, .mode = 0444 }, \ + .attr = { .name = #_name }, \ .show = power_supply_show_property, \ - .store = NULL, \ + .store = power_supply_store_property, \ }static struct device_attribute power_supply_attrs[];
@@ -91,6 +91,25 @@ static ssize_t power_supply_show_property(struct device *dev,return sprintf (buf,"%d\n" , value.intval); } +static ssize_t power_supply_store_property (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) { +ssize_t ret; +struct power_supply *psy =dev_get_drvdata (dev); +const ptrdiff_t off = attr - power_supply_attrs; +union power_supply_propval value; +long long_val; + +/* TODO: support other types than int */ + ret =strict_strtol (buf,10 , &long_val); +if (ret <0 ) +return ret; + + value.intval = long_val; + +return psy->set_property (psy, off, &value); +} +/* Must be in the same order as POWER_SUPPLY_PROP_* */ static struct device_attribute power_supply_attrs[] = {/* Properties of type `int' */
@@ -164,6 +183,14 @@ int power_supply_create_attrs(struct power_supply *psy) }for (j =0 ; j < psy->num_properties; j++) { +mode_t mode =S_IRUSR |S_IRGRP |S_IROTH ; + +if (psy->property_is_writeable && + psy->property_is_writeable (psy, psy->properties[j]) >0 ) + mode |=S_IWUSR ; + + power_supply_attrs[psy->properties[j]].attr.mode = mode; + rc =device_create_file (psy->dev, &power_supply_attrs[psy->properties[j]]);if (rc)
include/linux/power_supply.h +5 -0
@@ -144,6 +144,11 @@ struct power_supply {int (*get_property)(struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val); +int (*set_property)(struct power_supply *psy, +enum power_supply_property psp, +const union power_supply_propval *val); +int (*property_is_writeable)(struct power_supply *psy, +enum power_supply_property psp);void (*external_power_changed)(struct power_supply *psy);void (*set_charged)(struct power_supply *psy);
Signature · 1 line
1.6.3.3
PATCH 2/3 power/ds2760_battery: make charge_now and charge_full_design writeable
For userspace tools and daemons, it might be necessary to adjust the charge_now and charge_full_design properties of the ds2760 battery monitor, for example for unavoidable corrections due to aging batteries.
For better readbility and to avoid magic numbers in conversion calculations, RATED_CAPACITY_FACTOR was introduced.
--- drivers/power/ds2760_battery.c | 57 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 3 deletions(-)
drivers/power/ds2760_battery.c +54 -3
@@ -78,6 +78,7 @@ MODULE_PARM_DESC(current_accum, "current accumulator value");/* Some batteries have their rated capacity stored a N * 10 mAh, while * others use an index into this table. */ +#define RATED_CAPACITY_FACTOR 10static int rated_capacities[] = {0 ,920 ,/* Samsung */
@@ -170,7 +171,8 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di) di->rated_capacity = rated_capacities[ (unsigned int )di->raw[DS2760_RATED_CAPACITY ]]; else - di->rated_capacity = di->raw[DS2760_RATED_CAPACITY] * 10; + di->rated_capacity = di->raw[DS2760_RATED_CAPACITY] * +RATED_CAPACITY_FACTOR ; di->rated_capacity *=1000 ;/* convert to µAh */
@@ -426,6 +428,51 @@ static int ds2760_battery_get_property(struct power_supply *psy,return 0 ; } +static int ds2760_battery_set_property (struct power_supply *psy, +enum power_supply_property psp, +const union power_supply_propval *val) +{ +unsigned char tmp; +struct ds2760_device_info *di =to_ds2760_device_info (psy); + +switch (psp) { +case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN : +/* the interface counts in uAh, convert the value */ +ds2760_battery_write_rated_capacity (di, (val->intval /1000L ) / +RATED_CAPACITY_FACTOR ); +break ; + +case POWER_SUPPLY_PROP_CHARGE_NOW : + tmp = val->intval &0xff ; +w1_ds2760_write (di->w1_dev, &tmp,DS2760_CURRENT_ACCUM_LSB ,1 ); + + tmp = val->intval >>8 ; +w1_ds2760_write (di->w1_dev, &tmp,DS2760_CURRENT_ACCUM_MSB ,1 ); + +break ; + +default : +return -EPERM ; + } + +return -EINVAL ; +} + +static int ds2760_battery_property_is_writeable (struct power_supply *psy, +enum power_supply_property psp) +{ +switch (psp) { +case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN : +case POWER_SUPPLY_PROP_CHARGE_NOW : +return 1 ; + +default : +return 0 ; + } + +return 0 ; +} +static enum power_supply_property ds2760_battery_props[] = {POWER_SUPPLY_PROP_STATUS ,POWER_SUPPLY_PROP_VOLTAGE_NOW ,
@@ -460,6 +507,9 @@ static int ds2760_battery_probe(struct platform_device *pdev) di->bat.properties = ds2760_battery_props; di->bat.num_properties =ARRAY_SIZE (ds2760_battery_props); di->bat.get_property = ds2760_battery_get_property; + di->bat.set_property = ds2760_battery_set_property; + di->bat.property_is_writeable = + ds2760_battery_property_is_writeable; di->bat.set_charged = ds2760_battery_set_charged; di->bat.external_power_changed = ds2760_battery_external_power_changed;
@@ -476,9 +526,10 @@ static int ds2760_battery_probe(struct platform_device *pdev)ds2760_battery_write_status (di, status); -/* set rated capacity from module param */ +/* set rated capacity from module param (given in 10 * mAh) */ if (rated_capacity) -ds2760_battery_write_rated_capacity (di, rated_capacity); +ds2760_battery_write_rated_capacity (di, + (rated_capacity *10 ) /RATED_CAPACITY_FACTOR );/* set current accumulator if given as parameter. * this should only be done for bootstrapping the value */
Signature · 1 line
1.6.3.3
Re: [PATCH 2/3] power/ds2760_battery: make charge_now and charge_full_design writeable
Quoted 3 lines · Daniel Mack
For userspace tools and daemons, it might be necessary to adjust the
charge_nowandcharge_full_designproperties of the ds2760 battery monitor, for example for unavoidable corrections due to aging batteries.
Changing charge_full_design seems really odd - I'd really expect that to be something which is constant throughout the lifetime of the system. A separate property showing the degraded capacity would be a bit less surprising.
Re: [PATCH 2/3] power/ds2760_battery: make charge_now and charge_full_design writeable
Quoted 9 lines · Mark Brown
Quoted 3 lines · Daniel Mack
For userspace tools and daemons, it might be necessary to adjust the
charge_nowandcharge_full_designproperties of the ds2760 battery monitor, for example for unavoidable corrections due to aging batteries.Changing
charge_full_designseems really odd - I'd really expect that to be something which is constant throughout the lifetime of the system. A separate property showing the degraded capacity would be a bit less surprising.
There's 'carge_full' as well. I'll use this one instead.
Thanks,
Daniel
RFC PATCH 3/3 power/ds2760_battery: use factor of 50 for rated_capacity
In reply to Daniel MackIn the ds2760 driver, the currently used factor of 10 to store the rated battery capacity internally is not sufficient for batteries > 2.55 Ah, as the 8-bit register will overflow.
Change the factor to 20 to broaden that range. Note that due to RATED_CAPACITY_FACTOR, the internal interface won't change, neither for the writeable sysfs entires nor for the kernel rated_capacity module parameter.
--- drivers/power/ds2760_battery.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/power/ds2760_battery.c +1 -1
@@ -78,7 +78,7 @@ MODULE_PARM_DESC(current_accum, "current accumulator value");/* Some batteries have their rated capacity stored a N * 10 mAh, while * others use an index into this table. */ -#define RATED_CAPACITY_FACTOR 10 +#define RATED_CAPACITY_FACTOR 20static int rated_capacities[] = {0 ,920 ,/* Samsung */
Signature · 1 line
1.6.3.3
Sorry for the resend guys. My clock was skewed again, which might cause people missing the messages. Fixed some commit logs on the way.
Sent from a tired brain, excuse typos :)
Quoted 104 lines · Daniel Mack
This patch adds support for writeable power supply properties and exposes them as writeable to sysfs.
A power supply implementation must implement two new function calls in order to use that feature:
int set_property(struct
power_supply*psy,
enumpower_supply_propertypsp, const unionpower_supply_propval*val);int property_is_writeable(struct
power_supply*psy,enum power_supply_property psp);Signed-off-by Daniel Mack <[email protected]>Cc Anton Vorontsov <[email protected]>Cc David Woodhouse <[email protected]>Cc Andres Salomon <[email protected]>Cc Alexey Starikovskiy <[email protected]>Cc Len Brown <[email protected]>Cc Mark Brown <[email protected]>Cc Matt Reimer <[email protected]>Cc Evgeniy Polyakov <[email protected]>Cc Tejun Heo <[email protected]>--- drivers/power/power_supply_sysfs.c | 31 +++++++++++++++++++++++++++++-- include/linux/power_supply.h | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-)drivers/power/power_supply_sysfs.c +29
-2@@ -31,9 +31,9 @@#define POWER_SUPPLY_ATTR (_name) \ { \ - .attr = { .name = #_name, .mode = 0444 }, \ + .attr = { .name = #_name }, \ .show = power_supply_show_property, \ - .store = NULL, \ + .store = power_supply_store_property, \ }static struct device_attribute power_supply_attrs[];@@ -91,6 +91,25 @@ static ssize_t power_supply_show_property(struct device *dev,return sprintf (buf,"%d\n" , value.intval); } +static ssize_t power_supply_store_property (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) { +ssize_t ret; +struct power_supply *psy =dev_get_drvdata (dev); +const ptrdiff_t off = attr - power_supply_attrs; +union power_supply_propval value; +long long_val; + +/* TODO: support other types than int */ + ret =strict_strtol (buf,10 , &long_val); +if (ret <0 ) +return ret; + + value.intval = long_val; + +return psy->set_property (psy, off, &value); +} +/* Must be in the same order as POWER_SUPPLY_PROP_* */ static struct device_attribute power_supply_attrs[] = {/* Properties of type `int' */ @@ -164,6 +183,14 @@ int power_supply_create_attrs(struct power_supply *psy) }for (j =0 ; j < psy->num_properties; j++) { +mode_t mode =S_IRUSR |S_IRGRP |S_IROTH ; + +if (psy->property_is_writeable && + psy->property_is_writeable (psy, psy->properties[j]) >0 ) + mode |=S_IWUSR ; + + power_supply_attrs[psy->properties[j]].attr.mode = mode; + rc =device_create_file (psy->dev, &power_supply_attrs[psy->properties[j]]);if (rc)include/linux/power_supply.h +5
-0@@ -144,6 +144,11 @@ struct power_supply {int (*get_property)(struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val); +int (*set_property)(struct power_supply *psy, +enum power_supply_property psp, +const union power_supply_propval *val); +int (*property_is_writeable)(struct power_supply *psy, +enum power_supply_property psp);void (*external_power_changed)(struct power_supply *psy);void (*set_charged)(struct power_supply *psy);Signature · 1 line
1.6.3.3
drivers/power/power_supply_sysfs.c static ssize_t power_supply_show_property(struct device *dev, · line 106
Quoted 4 lines · Daniel Mack
drivers/power/power_supply_sysfs.c +4
-0+/* TODO: support other types than int */ + ret =strict_strtol (buf,10 , &long_val); +if (ret <0 ) +return ret;
It'd be nicer if we could error out if this is used on properties with an inappropriate type but we don't seem to have type information anywhere convenient for implementing that, which is a bit unfortunate.
Otherwise this looks reasonable in itself.
Quoted 10 lines · Mark Brown
drivers/power/power_supply_sysfs.c static ssize_t power_supply_show_property(struct device *dev, · line 106
Quoted 4 lines · Daniel Mack
drivers/power/power_supply_sysfs.c +4
-0+/* TODO: support other types than int */ + ret =strict_strtol (buf,10 , &long_val); +if (ret <0 ) +return ret;It'd be nicer if we could error out if this is used on properties with an inappropriate type but we don't seem to have type information anywhere convenient for implementing that, which is a bit unfortunate.
Yep, hence the 'TODO' :)
So currently the verdict is: if we can't convert the input to an integer, we bail.
Quoted 1 line
Otherwise this looks reasonable in itself.
Ok, thanks.
Daniel