Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e42f4cc authored by Manaf Meethalavalappu Pallikunhi's avatar Manaf Meethalavalappu Pallikunhi Committed by Gerrit - the friendly Code Review server
Browse files

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: default avatarManaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
parent 59a631bc

drivers/power/supply/qcom/battery_current_limit.c

+19 −13
Original line number Diff line number Diff line 
/* 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",