Date:   Fri, 3 Feb 2023 13:37:35 +0100
From:   Sebastian Reichel <sebastian.reichel@collabora.com>
To:     "Sicelo A. Mhlongo" <absicsz@gmail.com>
Cc:     linux-pm@vger.kernel.org, pali@kernel.org, brauner@kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] power: supply: bq27xxx: fix reporting critical level
Message-ID: <20230203123735.g727eokllnqxqxft@mercury.elektranox.org>
References: <20230102091326.3959978-1-absicsz@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="sxu4t5ja4ywc753r"
Content-Disposition: inline
In-Reply-To: <20230102091326.3959978-1-absicsz@gmail.com>
Precedence: bulk


--sxu4t5ja4ywc753r
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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.
>=20
> This commit fixes the issue by swapping the order in which the flags are
> tested. It was tested with bq27200 in the Nokia N900.
>=20
> 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(-)
>=20
> diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/suppl=
y/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 =3D POWER_SUPPLY_CAPACITY_LEVEL_FULL;
> -		else if (di->cache.flags & BQ27000_FLAG_EDV1)
> -			level =3D POWER_SUPPLY_CAPACITY_LEVEL_LOW;
>  		else if (di->cache.flags & BQ27000_FLAG_EDVF)
>  			level =3D POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
> +		else if (di->cache.flags & BQ27000_FLAG_EDV1)
> +			level =3D POWER_SUPPLY_CAPACITY_LEVEL_LOW;
>  		else
>  			level =3D 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 =3D POWER_SUPPLY_CAPACITY_LEVEL_FULL;
> -		else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
> -			level =3D POWER_SUPPLY_CAPACITY_LEVEL_LOW;
>  		else if (di->cache.flags & BQ27XXX_FLAG_SOCF)
>  			level =3D POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
> +		else if (di->cache.flags & BQ27XXX_FLAG_SOC1)
> +			level =3D POWER_SUPPLY_CAPACITY_LEVEL_LOW;
>  		else
>  			level =3D POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
>  	}
> --=20
> 2.39.0
>=20

--sxu4t5ja4ywc753r
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmPdAA4ACgkQ2O7X88g7
+popZg/7Bss64T/oszZI0vrXMH3RLROTdxaY+8wYzgCDIdLoNCZqY2ujbwgoFCsk
Hi+UQijNtLY+4wHw3Vo8SHL3BkNO/A2qPkzeMPwbsRzKuOQSFr114zswplup8Bny
yHwTPEdBOCyZVH3526oSsXoQjwnwPYb+R4nZ6eexbgFO1iNiiGQ5oXGsYS4aFWMB
u1eu5tPrUkXQjP7/pEeyAr/vSuFJosWnAyA0ndaGosxMADi69zCkrTBhKEneAO/8
L0LRS8nZmzrv+nmXJil8xK84BrSXtwLZJF71m1J9Ozm7oCYPNhdjpP+4St1tAqm1
VNcPA3A9Asxw/K4KQ6TATk7gKde8ln7fdRXU8c/T2NBkuDFuEw/nQY/FKGqhxVNs
1CGDRyt2EcoViTzrpnz6pZvJaxvypA90dQYM6C6/7rZmrfRiYb1QIeXnZ3lOXhbi
ml0aHhHnFGmAe8QCkZxWkthFyJPi8zzbNPHhAvxqPjlGlEnlNAB+HV4EcY24z5L5
AvZQx4tEy+BigP/gQHoJ3Xq6i6MAfk92aR1DAEN2+DIaNwfSGBf5VOGqJ4DmjNQF
ZMFWqRZhb5SCNdiUD8Gegf4Z7gpqfQVjzjVqls8c8yXoeQecFGT7qhHXHIyzVchp
lvd41E1h9wDxbs9oqiJUnZIsahZtmodTTtAWIRdRnATUWgqPqDs=
=J924
-----END PGP SIGNATURE-----

--sxu4t5ja4ywc753r--