From: "Andrew F. Davis" <afd@ti.com> To: "Pali Rohár" <pali.rohar@gmail.com>, "Sebastian Reichel" <sre@kernel.org>, "Dmitry Eremin-Solenikov" <dbaryshkov@gmail.com>, "David Woodhouse" <dwmw2@infradead.org> Cc: Dan Murphy <dmurphy@ti.com>, <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, "Andrew F. Davis" <afd@ti.com> Subject: [PATCH v4 6/7] power: bq27xxx_battery: Cleanup health checking Date: Mon, 14 Sep 2015 16:26:12 -0500 [thread overview] Message-ID: <1442265973-32261-7-git-send-email-afd@ti.com> (raw) In-Reply-To: <1442265973-32261-1-git-send-email-afd@ti.com> Reorganize the logic checking battery health and add under temperature condition checking. Signed-off-by: Andrew F. Davis <afd@ti.com> --- drivers/power/bq27xxx_battery.c | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 22 deletions(-) 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) /* BQ27000 has different layout for Flags register */ #define BQ27000_FLAG_EDVF BIT(0) /* Final End-of-Discharge-Voltage flag */ @@ -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 == BQ27500 || di->chip == BQ27541) + if (di->chip == BQ27500 || di->chip == BQ27541 || di->chip == BQ27545) return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); + if (di->chip == BQ27530 || di->chip == 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 == BQ27530 || di->chip == 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 == BQ27000 || di->chip == BQ27010) + return flags & (BQ27000_FLAG_EDV1 | BQ27000_FLAG_EDVF); else - return flags & BQ27XXX_FLAG_OTC; + return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF); } /* @@ -635,29 +661,23 @@ static int bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) */ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di) { - u16 tval; + u16 flags; - tval = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); - if (tval < 0) { - dev_err(di->dev, "error reading flag register:%d\n", tval); - return tval; + flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); + if (flags < 0) { + dev_err(di->dev, "error reading flag register:%d\n", flags); + return flags; } - if (di->chip == BQ27000 || di->chip == BQ27010) { - if (tval & BQ27000_FLAG_EDV1) - tval = POWER_SUPPLY_HEALTH_DEAD; - else - tval = POWER_SUPPLY_HEALTH_GOOD; - } else { - if (tval & BQ27XXX_FLAG_SOCF) - tval = POWER_SUPPLY_HEALTH_DEAD; - else if (bq27xxx_battery_overtemp(di, tval)) - tval = POWER_SUPPLY_HEALTH_OVERHEAT; - else - tval = 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; - return tval; + return POWER_SUPPLY_HEALTH_GOOD; } static void bq27xxx_battery_update(struct bq27xxx_device_info *di) -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: "Andrew F. Davis" <afd@ti.com> To: "Pali Rohár" <pali.rohar@gmail.com>, "Sebastian Reichel" <sre@kernel.org>, "Dmitry Eremin-Solenikov" <dbaryshkov@gmail.com>, "David Woodhouse" <dwmw2@infradead.org> Cc: Dan Murphy <dmurphy@ti.com>, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Andrew F. Davis" <afd@ti.com> Subject: [PATCH v4 6/7] power: bq27xxx_battery: Cleanup health checking Date: Mon, 14 Sep 2015 16:26:12 -0500 [thread overview] Message-ID: <1442265973-32261-7-git-send-email-afd@ti.com> (raw) In-Reply-To: <1442265973-32261-1-git-send-email-afd@ti.com> Reorganize the logic checking battery health and add under temperature condition checking. Signed-off-by: Andrew F. Davis <afd@ti.com> --- drivers/power/bq27xxx_battery.c | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 22 deletions(-) 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) /* BQ27000 has different layout for Flags register */ #define BQ27000_FLAG_EDVF BIT(0) /* Final End-of-Discharge-Voltage flag */ @@ -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 == BQ27500 || di->chip == BQ27541) + if (di->chip == BQ27500 || di->chip == BQ27541 || di->chip == BQ27545) return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); + if (di->chip == BQ27530 || di->chip == 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 == BQ27530 || di->chip == 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 == BQ27000 || di->chip == BQ27010) + return flags & (BQ27000_FLAG_EDV1 | BQ27000_FLAG_EDVF); else - return flags & BQ27XXX_FLAG_OTC; + return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF); } /* @@ -635,29 +661,23 @@ static int bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) */ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di) { - u16 tval; + u16 flags; - tval = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); - if (tval < 0) { - dev_err(di->dev, "error reading flag register:%d\n", tval); - return tval; + flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); + if (flags < 0) { + dev_err(di->dev, "error reading flag register:%d\n", flags); + return flags; } - if (di->chip == BQ27000 || di->chip == BQ27010) { - if (tval & BQ27000_FLAG_EDV1) - tval = POWER_SUPPLY_HEALTH_DEAD; - else - tval = POWER_SUPPLY_HEALTH_GOOD; - } else { - if (tval & BQ27XXX_FLAG_SOCF) - tval = POWER_SUPPLY_HEALTH_DEAD; - else if (bq27xxx_battery_overtemp(di, tval)) - tval = POWER_SUPPLY_HEALTH_OVERHEAT; - else - tval = 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; - return tval; + return POWER_SUPPLY_HEALTH_GOOD; } static void bq27xxx_battery_update(struct bq27xxx_device_info *di) -- 1.9.1
next prev parent reply other threads:[~2015-09-14 21:27 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-14 21:26 [PATCH v4 0/7] Add support for additional bq27xxx devices Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-14 21:26 ` [PATCH v4 1/7] power: bq27x00_battery: Remove unneeded i2c MODULE_ALIAS Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-21 8:33 ` Pali Rohár 2015-09-22 15:18 ` Sebastian Reichel 2015-09-14 21:26 ` [PATCH v4 2/7] power: bq27x00_battery: Renaming for consistency Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-15 8:32 ` Laurentiu Palcu 2015-09-15 16:53 ` Andrew F. Davis 2015-09-22 16:10 ` Sebastian Reichel 2015-09-14 21:26 ` [PATCH v4 3/7] power: bq27xxx_battery: Platform initialization must declare a device Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-21 8:41 ` Pali Rohár 2015-09-21 18:40 ` Andrew F. Davis 2015-09-21 18:40 ` Andrew F. Davis 2015-09-14 21:26 ` [PATCH v4 4/7] power: bq27xxx_battery: Fix typos and change naming for state of charge functions Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-21 8:36 ` Pali Rohár 2015-09-14 21:26 ` [PATCH v4 5/7] power: bq27xxx_battery: Add support for additional bq27xxx family devices Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-21 8:46 ` Pali Rohár 2015-09-21 19:02 ` Andrew F. Davis 2015-09-21 19:02 ` Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis [this message] 2015-09-14 21:26 ` [PATCH v4 6/7] power: bq27xxx_battery: Cleanup health checking Andrew F. Davis 2015-09-21 8:35 ` Pali Rohár 2015-09-14 21:26 ` [PATCH v4 7/7] power: bq27xxx_battery: Add interrupt handling support Andrew F. Davis 2015-09-14 21:26 ` Andrew F. Davis 2015-09-15 18:47 ` Andreas Dannenberg 2015-09-15 20:53 ` Andrew F. Davis
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=1442265973-32261-7-git-send-email-afd@ti.com \ --to=afd@ti.com \ --cc=dbaryshkov@gmail.com \ --cc=dmurphy@ti.com \ --cc=dwmw2@infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=pali.rohar@gmail.com \ --cc=sre@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.