From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pali =?utf-8?B?Um9ow6Fy?= Subject: Re: [PATCH v4 6/7] power: bq27xxx_battery: Cleanup health checking Date: Mon, 21 Sep 2015 10:35:39 +0200 Message-ID: <20150921083539.GF20113@pali> References: <1442265973-32261-1-git-send-email-afd@ti.com> <1442265973-32261-7-git-send-email-afd@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-wi0-f174.google.com ([209.85.212.174]:36033 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756054AbbIUIfm (ORCPT ); Mon, 21 Sep 2015 04:35:42 -0400 Content-Disposition: inline In-Reply-To: <1442265973-32261-7-git-send-email-afd@ti.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: "Andrew F. Davis" Cc: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Dan Murphy , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org On Monday 14 September 2015 16:26:12 Andrew F. Davis wrote: > Reorganize the logic checking battery health and add under temperatur= e > condition checking. >=20 > Signed-off-by: Andrew F. Davis Acked-by: Pali Roh=C3=A1r > --- > drivers/power/bq27xxx_battery.c | 64 +++++++++++++++++++++++++++----= ---------- > 1 file changed, 42 insertions(+), 22 deletions(-) >=20 > diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_= battery.c > index 3098609..10be8a6 100644 > --- a/drivers/power/bq27xxx_battery.c > +++ b/drivers/power/bq27xxx_battery.c > @@ -63,6 +63,8 @@ > #define BQ27XXX_FLAG_FC BIT(9) > #define BQ27XXX_FLAG_OTD BIT(14) > #define BQ27XXX_FLAG_OTC BIT(15) > +#define BQ27XXX_FLAG_UT BIT(14) > +#define BQ27XXX_FLAG_OT BIT(15) > =20 > /* BQ27000 has different layout for Flags register */ > #define BQ27000_FLAG_EDVF BIT(0) /* Final End-of-Discharge-Voltage f= lag */ > @@ -621,12 +623,36 @@ static int bq27xxx_battery_read_pwr_avg(struct = bq27xxx_device_info *di) > /* > * Returns true if a battery over temperature condition is detected > */ > -static int bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, = u16 flags) > +static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di,= u16 flags) > { > - if (di->chip =3D=3D BQ27500 || di->chip =3D=3D BQ27541) > + if (di->chip =3D=3D BQ27500 || di->chip =3D=3D BQ27541 || di->chip = =3D=3D BQ27545) > return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); > + if (di->chip =3D=3D BQ27530 || di->chip =3D=3D BQ27421) > + return flags & BQ27XXX_FLAG_OT; > + > + return false; > +} > + > +/* > + * Returns true if a battery under temperature condition is detected > + */ > +static bool bq27xxx_battery_undertemp(struct bq27xxx_device_info *di= , u16 flags) > +{ > + if (di->chip =3D=3D BQ27530 || di->chip =3D=3D BQ27421) > + return flags & BQ27XXX_FLAG_UT; > + > + return false; > +} > + > +/* > + * Returns true if a low state of charge condition is detected > + */ > +static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16= flags) > +{ > + if (di->chip =3D=3D BQ27000 || di->chip =3D=3D BQ27010) > + return flags & (BQ27000_FLAG_EDV1 | BQ27000_FLAG_EDVF); > else > - return flags & BQ27XXX_FLAG_OTC; > + return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF); > } > =20 > /* > @@ -635,29 +661,23 @@ static int bq27xxx_battery_overtemp(struct bq27= xxx_device_info *di, u16 flags) > */ > static int bq27xxx_battery_read_health(struct bq27xxx_device_info *d= i) > { > - u16 tval; > + u16 flags; > =20 > - tval =3D bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); > - if (tval < 0) { > - dev_err(di->dev, "error reading flag register:%d\n", tval); > - return tval; > + flags =3D bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); > + if (flags < 0) { > + dev_err(di->dev, "error reading flag register:%d\n", flags); > + return flags; > } > =20 > - if (di->chip =3D=3D BQ27000 || di->chip =3D=3D BQ27010) { > - if (tval & BQ27000_FLAG_EDV1) > - tval =3D POWER_SUPPLY_HEALTH_DEAD; > - else > - tval =3D POWER_SUPPLY_HEALTH_GOOD; > - } else { > - if (tval & BQ27XXX_FLAG_SOCF) > - tval =3D POWER_SUPPLY_HEALTH_DEAD; > - else if (bq27xxx_battery_overtemp(di, tval)) > - tval =3D POWER_SUPPLY_HEALTH_OVERHEAT; > - else > - tval =3D POWER_SUPPLY_HEALTH_GOOD; > - } > + /* Unlikely but important to return first */ > + if (unlikely(bq27xxx_battery_overtemp(di, flags))) > + return POWER_SUPPLY_HEALTH_OVERHEAT; > + if (unlikely(bq27xxx_battery_undertemp(di, flags))) > + return POWER_SUPPLY_HEALTH_COLD; > + if (unlikely(bq27xxx_battery_dead(di, flags))) > + return POWER_SUPPLY_HEALTH_DEAD; > =20 > - return tval; > + return POWER_SUPPLY_HEALTH_GOOD; > } > =20 > static void bq27xxx_battery_update(struct bq27xxx_device_info *di) --=20 Pali Roh=C3=A1r pali.rohar@gmail.com