* [PATCH 1/1] power: supply: bq27xxx: fix reporting critical level
@ 2023-01-02 9:13 Sicelo A. Mhlongo
2023-02-03 12:37 ` Sebastian Reichel
0 siblings, 1 reply; 2+ messages in thread
From: Sicelo A. Mhlongo @ 2023-01-02 9:13 UTC (permalink / raw)
To: linux-pm; +Cc: pali, sre, brauner, linux-kernel, Sicelo A. Mhlongo
The EDV1/SOC1 flag is set when the battery voltage drops below the
threshold set in EEPROM. From observing the capacity_level reported by
the driver, and reading the datasheet, EDV1 remains set even when
EDVF/SOCF gets set. Thus, bq27xxx_battery_capacity_level() never reaches
the CAPACITY_LEVEL_CRITICAL code path, since CAPACITY_LEVEL_LOW takes
precedence.
This commit fixes the issue by swapping the order in which the flags are
tested. It was tested with bq27200 in the Nokia N900.
Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
---
drivers/power/supply/bq27xxx_battery.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index 8bf048fbd36a..5ff6f44fd47b 100644
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -1917,10 +1917,10 @@ static int bq27xxx_battery_capacity_level(struct bq27xxx_device_info *di,
if (di->opts & BQ27XXX_O_ZERO) {
if (di->cache.flags & BQ27000_FLAG_FC)
level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
- else if (di->cache.flags & BQ27000_FLAG_EDV1)
- level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
else if (di->cache.flags & BQ27000_FLAG_EDVF)
level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+ else if (di->cache.flags & BQ27000_FLAG_EDV1)
+ level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
else
level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
} else if (di->opts & BQ27Z561_O_BITS) {
@@ -1933,10 +1933,10 @@ static int bq27xxx_battery_capacity_level(struct bq27xxx_device_info *di,
} else {
if (di->cache.flags & BQ27XXX_FLAG_FC)
level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
- else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
- level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
else if (di->cache.flags & BQ27XXX_FLAG_SOCF)
level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+ else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
+ level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
else
level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
}
--
2.39.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] power: supply: bq27xxx: fix reporting critical level
2023-01-02 9:13 [PATCH 1/1] power: supply: bq27xxx: fix reporting critical level Sicelo A. Mhlongo
@ 2023-02-03 12:37 ` Sebastian Reichel
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Reichel @ 2023-02-03 12:37 UTC (permalink / raw)
To: Sicelo A. Mhlongo; +Cc: linux-pm, pali, brauner, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2290 bytes --]
Hi,
On Mon, Jan 02, 2023 at 11:13:26AM +0200, Sicelo A. Mhlongo wrote:
> The EDV1/SOC1 flag is set when the battery voltage drops below the
> threshold set in EEPROM. From observing the capacity_level reported by
> the driver, and reading the datasheet, EDV1 remains set even when
> EDVF/SOCF gets set. Thus, bq27xxx_battery_capacity_level() never reaches
> the CAPACITY_LEVEL_CRITICAL code path, since CAPACITY_LEVEL_LOW takes
> precedence.
>
> This commit fixes the issue by swapping the order in which the flags are
> tested. It was tested with bq27200 in the Nokia N900.
>
> Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
> ---
Thanks, queued.
-- Sebastian
> drivers/power/supply/bq27xxx_battery.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
> index 8bf048fbd36a..5ff6f44fd47b 100644
> --- a/drivers/power/supply/bq27xxx_battery.c
> +++ b/drivers/power/supply/bq27xxx_battery.c
> @@ -1917,10 +1917,10 @@ static int bq27xxx_battery_capacity_level(struct bq27xxx_device_info *di,
> if (di->opts & BQ27XXX_O_ZERO) {
> if (di->cache.flags & BQ27000_FLAG_FC)
> level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
> - else if (di->cache.flags & BQ27000_FLAG_EDV1)
> - level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
> else if (di->cache.flags & BQ27000_FLAG_EDVF)
> level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
> + else if (di->cache.flags & BQ27000_FLAG_EDV1)
> + level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
> else
> level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
> } else if (di->opts & BQ27Z561_O_BITS) {
> @@ -1933,10 +1933,10 @@ static int bq27xxx_battery_capacity_level(struct bq27xxx_device_info *di,
> } else {
> if (di->cache.flags & BQ27XXX_FLAG_FC)
> level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
> - else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
> - level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
> else if (di->cache.flags & BQ27XXX_FLAG_SOCF)
> level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
> + else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
> + level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
> else
> level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
> }
> --
> 2.39.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-03 12:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-02 9:13 [PATCH 1/1] power: supply: bq27xxx: fix reporting critical level Sicelo A. Mhlongo
2023-02-03 12:37 ` Sebastian Reichel
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).