From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDD49C761A8 for ; Thu, 25 Jul 2019 08:55:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACFC322CB9 for ; Thu, 25 Jul 2019 08:55:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389970AbfGYIzh (ORCPT ); Thu, 25 Jul 2019 04:55:37 -0400 Received: from icp-osb-irony-out1.external.iinet.net.au ([203.59.1.210]:13393 "EHLO icp-osb-irony-out1.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388546AbfGYIzh (ORCPT ); Thu, 25 Jul 2019 04:55:37 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AkBQC3bTld/1/rO8tmghmDdhIXE40?= =?us-ascii?q?ZiBcBgkMBg1mFU48egXsJAQEBAQEBAQEBGxwBAYQ6BIMCNAkOAQMBAQEEAQE?= =?us-ascii?q?BAQUBbYRlRYV4L3JwEoMigXcTrkwzhAYBhG6BSIE0hwmEboFAP4ERgmRshAM?= =?us-ascii?q?NGIV/BIwkiROVNQmBJXeUEhmYC4tggViZTTiBWE0fGYMngk4XFI1WRDUwjko?= =?us-ascii?q?BAQ?= X-IPAS-Result: =?us-ascii?q?A2AkBQC3bTld/1/rO8tmghmDdhIXE40ZiBcBgkMBg1mFU?= =?us-ascii?q?48egXsJAQEBAQEBAQEBGxwBAYQ6BIMCNAkOAQMBAQEEAQEBAQUBbYRlRYV4L?= =?us-ascii?q?3JwEoMigXcTrkwzhAYBhG6BSIE0hwmEboFAP4ERgmRshAMNGIV/BIwkiROVN?= =?us-ascii?q?QmBJXeUEhmYC4tggViZTTiBWE0fGYMngk4XFI1WRDUwjkoBAQ?= X-IronPort-AV: E=Sophos;i="5.64,306,1559491200"; d="scan'208";a="228554185" Received: from 203-59-235-95.perm.iinet.net.au (HELO rtcentos7.electromag.com.au) ([203.59.235.95]) by icp-osb-irony-out1.iinet.net.au with ESMTP; 25 Jul 2019 16:55:30 +0800 From: Richard Tresidder To: sre@kernel.org, enric.balletbo@collabora.com, ncrews@chromium.org, andrew.smirnov@gmail.com, groeck@chromium.org, rtresidd@electromag.com.au, david@lechnology.com, tglx@linutronix.de, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, rfontana@redhat.com, allison@lohutok.net, baolin.wang@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND v2 1/1] power/supply/sbs-battery: Fix confusing battery status when idle or empty Date: Thu, 25 Jul 2019 16:55:29 +0800 Message-Id: <1564044929-26104-1-git-send-email-rtresidd@electromag.com.au> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a battery or batteries in a system are in parallel then one or more may not be providing any current to the system. This fixes an incorrect status indication of FULL for the battery simply because it wasn't discharging at that point in time. The battery will now be flagged as IDLE. Have also added the additional check for the battery FULL DISCHARGED flag which will now flag a status of EMPTY. Signed-off-by: Richard Tresidder --- Notes: power/supply/sbs-battery: Fix confusing battery status when idle or empty When a battery or batteries in a system are in parallel then one or more may not be providing any current to the system. This fixes an incorrect status indication of FULL for the battery simply because it wasn't discharging at that point in time. The battery will now be flagged as IDLE. Have also added the additional check for the battery FULL DISCHARGED flag which will now flag a status of EMPTY. v2: missed a later merge that should have been included in original patch drivers/power/supply/power_supply_sysfs.c | 3 ++- drivers/power/supply/sbs-battery.c | 32 +++++++++++++++---------------- include/linux/power_supply.h | 2 ++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index ce6671c..68ec49d 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -51,7 +51,8 @@ }; static const char * const power_supply_status_text[] = { - "Unknown", "Charging", "Discharging", "Not charging", "Full" + "Unknown", "Charging", "Discharging", "Not charging", "Full", + "Empty", "Idle" }; static const char * const power_supply_charge_type_text[] = { diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index ea8ba3e..664c317 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -294,16 +294,12 @@ static int sbs_status_correct(struct i2c_client *client, int *intval) ret = (s16)ret; - /* Not drawing current means full (cannot be not charging) */ - if (ret == 0) - *intval = POWER_SUPPLY_STATUS_FULL; - - if (*intval == POWER_SUPPLY_STATUS_FULL) { - /* Drawing or providing current when full */ - if (ret > 0) - *intval = POWER_SUPPLY_STATUS_CHARGING; - else if (ret < 0) - *intval = POWER_SUPPLY_STATUS_DISCHARGING; + if ((*intval == POWER_SUPPLY_STATUS_DISCHARGING && (ret == 0)) { + /* Charging indicator not set in battery */ + *intval = POWER_SUPPLY_STATUS_IDLE; + } else if ((*intval == POWER_SUPPLY_STATUS_FULL) && (ret < 0)) { + /* Full Flag set but we are discharging */ + *intval = POWER_SUPPLY_STATUS_DISCHARGING; } return 0; @@ -424,10 +420,12 @@ static int sbs_get_battery_property(struct i2c_client *client, if (ret & BATTERY_FULL_CHARGED) val->intval = POWER_SUPPLY_STATUS_FULL; - else if (ret & BATTERY_DISCHARGING) - val->intval = POWER_SUPPLY_STATUS_DISCHARGING; - else + else if (ret & BATTERY_FULL_DISCHARGED) + val->intval = POWER_SUPPLY_STATUS_EMPTY; + else if (!(ret & BATTERY_DISCHARGING)) val->intval = POWER_SUPPLY_STATUS_CHARGING; + else + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; sbs_status_correct(client, &val->intval); @@ -781,10 +779,12 @@ static void sbs_delayed_work(struct work_struct *work) if (ret & BATTERY_FULL_CHARGED) ret = POWER_SUPPLY_STATUS_FULL; - else if (ret & BATTERY_DISCHARGING) - ret = POWER_SUPPLY_STATUS_DISCHARGING; - else + else if (ret & BATTERY_FULL_DISCHARGED) + ret = POWER_SUPPLY_STATUS_EMPTY; + else if (!(ret & BATTERY_DISCHARGING)) ret = POWER_SUPPLY_STATUS_CHARGING; + else + ret = POWER_SUPPLY_STATUS_DISCHARGING; sbs_status_correct(chip->client, &ret); diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 28413f7..c9f3347 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -37,6 +37,8 @@ enum { POWER_SUPPLY_STATUS_DISCHARGING, POWER_SUPPLY_STATUS_NOT_CHARGING, POWER_SUPPLY_STATUS_FULL, + POWER_SUPPLY_STATUS_EMPTY, + POWER_SUPPLY_STATUS_IDLE, }; /* What algorithm is the charger using? */ -- 1.8.3.1