| Message ID | 20170414125919.25771-6-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Apr 14, 2017 at 02:59:12PM +0200, Hans de Goede wrote: > Userspace prefers the driver having a status property over having to guess > itself. Specifically this will properly make the GNOME3 UI (and likely > others) properly show discharging / charging / full status, instead > of always showing discharging as status. > > Note that in the case there is no charger driver supplying the max17042, > then a status of unknown will get returned. At least upower treats > this the same as not having a status attribute, so in this case nothing > changes from a userspace pov. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/power/supply/max17042_battery.c | 49 +++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c > index f8a0384..1ea8368 100644 > --- a/drivers/power/supply/max17042_battery.c > +++ b/drivers/power/supply/max17042_battery.c > @@ -65,6 +65,9 @@ > > #define MAX17042_VMAX_TOLERANCE 50 /* 50 mV */ > > +/* Consider RepCap which is less then 10 units below FullCAP full */ > +#define MAX17042_FULL_THRESHOLD 10 How about grouping all of defaults and configuration values in one place? Some of them are already in include/linux/power/max17042_battery.h. Best regards, Krzysztof
Hi, On 14-04-17 18:11, Krzysztof Kozlowski wrote: > On Fri, Apr 14, 2017 at 02:59:12PM +0200, Hans de Goede wrote: >> Userspace prefers the driver having a status property over having to guess >> itself. Specifically this will properly make the GNOME3 UI (and likely >> others) properly show discharging / charging / full status, instead >> of always showing discharging as status. >> >> Note that in the case there is no charger driver supplying the max17042, >> then a status of unknown will get returned. At least upower treats >> this the same as not having a status attribute, so in this case nothing >> changes from a userspace pov. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/power/supply/max17042_battery.c | 49 +++++++++++++++++++++++++++++++++ >> 1 file changed, 49 insertions(+) >> >> diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c >> index f8a0384..1ea8368 100644 >> --- a/drivers/power/supply/max17042_battery.c >> +++ b/drivers/power/supply/max17042_battery.c >> @@ -65,6 +65,9 @@ >> >> #define MAX17042_VMAX_TOLERANCE 50 /* 50 mV */ >> >> +/* Consider RepCap which is less then 10 units below FullCAP full */ >> +#define MAX17042_FULL_THRESHOLD 10 > > How about grouping all of defaults and configuration values in one > place? Some of them are already in > include/linux/power/max17042_battery.h. Ok, I will move this to include/linux/power/max17042_battery.h for v2. Regards, Hans
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index f8a0384..1ea8368 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -65,6 +65,9 @@ #define MAX17042_VMAX_TOLERANCE 50 /* 50 mV */ +/* Consider RepCap which is less then 10 units below FullCAP full */ +#define MAX17042_FULL_THRESHOLD 10 + struct max17042_chip { struct i2c_client *client; struct regmap *regmap; @@ -76,6 +79,7 @@ struct max17042_chip { }; static enum power_supply_property max17042_battery_props[] = { + POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_CYCLE_COUNT, POWER_SUPPLY_PROP_VOLTAGE_MAX, @@ -113,6 +117,46 @@ static int max17042_get_temperature(struct max17042_chip *chip, int *temp) return 0; } +static int max17042_get_status(struct max17042_chip *chip, int *status) +{ + int ret, charge_full, charge_now; + + ret = power_supply_am_i_supplied(chip->battery); + if (ret < 0) { + *status = POWER_SUPPLY_STATUS_UNKNOWN; + return 0; + } + if (ret == 0) { + *status = POWER_SUPPLY_STATUS_DISCHARGING; + return 0; + } + + /* + * The MAX170xx has builtin end-of-charge detection and will update + * FullCAP to match RepCap when it detects end of charging. + * + * When this cycle the battery gets charged to a higher (calculated) + * capacity then the previous cycle then FullCAP will get updated + * contineously once end-of-charge detection kicks in, so allow the + * 2 to differ a bit. + */ + + ret = regmap_read(chip->regmap, MAX17042_FullCAP, &charge_full); + if (ret < 0) + return ret; + + ret = regmap_read(chip->regmap, MAX17042_RepCap, &charge_now); + if (ret < 0) + return ret; + + if ((charge_full - charge_now) <= MAX17042_FULL_THRESHOLD) + *status = POWER_SUPPLY_STATUS_FULL; + else + *status = POWER_SUPPLY_STATUS_CHARGING; + + return 0; +} + static int max17042_get_battery_health(struct max17042_chip *chip, int *health) { int temp, vavg, vbatt, ret; @@ -182,6 +226,11 @@ static int max17042_get_property(struct power_supply *psy, return -EAGAIN; switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + ret = max17042_get_status(chip, &val->intval); + if (ret < 0) + return ret; + break; case POWER_SUPPLY_PROP_PRESENT: ret = regmap_read(map, MAX17042_STATUS, &data); if (ret < 0)
Userspace prefers the driver having a status property over having to guess itself. Specifically this will properly make the GNOME3 UI (and likely others) properly show discharging / charging / full status, instead of always showing discharging as status. Note that in the case there is no charger driver supplying the max17042, then a status of unknown will get returned. At least upower treats this the same as not having a status attribute, so in this case nothing changes from a userspace pov. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/max17042_battery.c | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)