From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: "Sicelo A. Mhlongo" <absicsz@gmail.com>
Cc: pali@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/1] power: supply: bq27xxx: expose battery data when CI=1
Date: Tue, 3 May 2022 17:38:53 +0200 [thread overview]
Message-ID: <20220503153853.k6aysmjep6r7yazu@mercury.elektranox.org> (raw)
In-Reply-To: <20220420123059.1206443-2-absicsz@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4659 bytes --]
Hi,
On Wed, Apr 20, 2022 at 02:30:59PM +0200, Sicelo A. Mhlongo wrote:
> When the Capacity Inaccurate flag is set, the chip still provides data
> about the battery, albeit inaccurate. Instead of discarding capacity
> values for CI=1, expose the stale data and use the
> POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED property to indicate that the
> values should be used with care.
>
> Reviewed-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
> ---
Thanks, queued.
-- Sebastian
> drivers/power/supply/bq27xxx_battery.c | 59 ++++++++++++--------------
> 1 file changed, 27 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
> index 72e727cd31e8..9adc7f43bbfd 100644
> --- a/drivers/power/supply/bq27xxx_battery.c
> +++ b/drivers/power/supply/bq27xxx_battery.c
> @@ -1572,14 +1572,6 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg)
> */
> static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
> {
> - int flags;
> -
> - if (di->opts & BQ27XXX_O_ZERO) {
> - flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
> - if (flags >= 0 && (flags & BQ27000_FLAG_CI))
> - return -ENODATA;
> - }
> -
> return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
> }
>
> @@ -1742,6 +1734,18 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
> return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
> }
>
> +/*
> + * Returns true if reported battery capacity is inaccurate
> + */
> +static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
> + u16 flags)
> +{
> + if (di->opts & BQ27XXX_O_HAS_CI)
> + return (flags & BQ27000_FLAG_CI);
> + else
> + return false;
> +}
> +
> static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
> {
> /* Unlikely but important to return first */
> @@ -1751,6 +1755,8 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
> return POWER_SUPPLY_HEALTH_COLD;
> if (unlikely(bq27xxx_battery_dead(di, di->cache.flags)))
> return POWER_SUPPLY_HEALTH_DEAD;
> + if (unlikely(bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
> + return POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
>
> return POWER_SUPPLY_HEALTH_GOOD;
> }
> @@ -1766,30 +1772,19 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
> cache.flags = -1; /* read error */
> if (cache.flags >= 0) {
> cache.temperature = bq27xxx_battery_read_temperature(di);
> - if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
> - dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
> - cache.capacity = -ENODATA;
> - cache.energy = -ENODATA;
> - cache.time_to_empty = -ENODATA;
> - cache.time_to_empty_avg = -ENODATA;
> - cache.time_to_full = -ENODATA;
> - cache.charge_full = -ENODATA;
> - cache.health = -ENODATA;
> - } else {
> - if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
> - cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
> - if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
> - cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
> - if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
> - cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
> -
> - cache.charge_full = bq27xxx_battery_read_fcc(di);
> - cache.capacity = bq27xxx_battery_read_soc(di);
> - if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
> - cache.energy = bq27xxx_battery_read_energy(di);
> - di->cache.flags = cache.flags;
> - cache.health = bq27xxx_battery_read_health(di);
> - }
> + if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
> + cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
> + if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
> + cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
> + if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
> + cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
> +
> + cache.charge_full = bq27xxx_battery_read_fcc(di);
> + cache.capacity = bq27xxx_battery_read_soc(di);
> + if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
> + cache.energy = bq27xxx_battery_read_energy(di);
> + di->cache.flags = cache.flags;
> + cache.health = bq27xxx_battery_read_health(di);
> if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)
> cache.cycle_count = bq27xxx_battery_read_cyct(di);
>
> --
> 2.35.2
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2022-05-03 15:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 12:30 [PATCH v2 0/1] power: supply: bq27xxx: expose battery data when CI=1 Sicelo A. Mhlongo
2022-04-20 12:30 ` [PATCH v2 1/1] " Sicelo A. Mhlongo
2022-05-03 15:38 ` Sebastian Reichel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220503153853.k6aysmjep6r7yazu@mercury.elektranox.org \
--to=sebastian.reichel@collabora.com \
--cc=absicsz@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pali@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).