diff options
| author | Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org> | 2017-02-15 17:41:55 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-28 23:25:02 -0800 |
| commit | 1e42f4cc4f4bd637e8af363c2b7f2d75bc12ad53 (patch) | |
| tree | cb84ca05b19aa2722ff9bac52821c3b0e1f6b388 | |
| parent | 59a631bcacba622a294d0c9e9e54ac9161413950 (diff) | |
power: bcl: Fix battery SoC read and evaluation whenever BCL enabled
Just after enabling BCL, reading and evaluating current battery SoC
is bypassed. Because of this, during this same time if battery SoC
is less than preset threshold, BCL doesn't mitigate until next battery
SoC change notification comes. Fix battery SoC read and evaluation
path whenever BCL is enabled.
CRs-Fixed: 2007133
Change-Id: I65639ab078875dc3f6940fd1a89201af98e40881
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
| -rw-r--r-- | drivers/power/supply/qcom/battery_current_limit.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/drivers/power/supply/qcom/battery_current_limit.c b/drivers/power/supply/qcom/battery_current_limit.c index d2c25bfbf66c..cb8a707d0f37 100644 --- a/drivers/power/supply/qcom/battery_current_limit.c +++ b/drivers/power/supply/qcom/battery_current_limit.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -285,23 +285,13 @@ static void soc_mitigate(struct work_struct *work) update_cpu_freq(); } -static int power_supply_callback(struct notifier_block *nb, - unsigned long event, void *data) +static int get_and_evaluate_battery_soc(void) { - struct power_supply *psy = data; static struct power_supply *batt_psy; union power_supply_propval ret = {0,}; int battery_percentage; enum bcl_threshold_state prev_soc_state; - if (gbcl->bcl_mode != BCL_DEVICE_ENABLED) { - pr_debug("BCL is not enabled\n"); - return NOTIFY_OK; - } - - if (strcmp(psy->desc->name, "battery")) - return NOTIFY_OK; - if (!batt_psy) batt_psy = power_supply_get_by_name("battery"); if (batt_psy) { @@ -325,6 +315,22 @@ static int power_supply_callback(struct notifier_block *nb, return NOTIFY_OK; } +static int power_supply_callback(struct notifier_block *nb, + unsigned long event, void *data) +{ + struct power_supply *psy = data; + + if (gbcl->bcl_mode != BCL_DEVICE_ENABLED) { + pr_debug("BCL is not enabled\n"); + return NOTIFY_OK; + } + + if (strcmp(psy->desc->name, "battery")) + return NOTIFY_OK; + + return get_and_evaluate_battery_soc(); +} + static int bcl_get_battery_voltage(int *vbatt_mv) { static struct power_supply *psy; @@ -643,7 +649,7 @@ static void bcl_periph_mode_set(enum bcl_device_mode mode) * power state changes. Make sure we read the current SoC * and mitigate. */ - power_supply_callback(&gbcl->psy_nb, 1, gbcl); + get_and_evaluate_battery_soc(); ret = power_supply_reg_notifier(&gbcl->psy_nb); if (ret < 0) { pr_err("Unable to register soc notifier rc = %d\n", |