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

Commit 51a8149b authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

power: qpnp-fg-gen3: Add more details to profile load status 



Currently, in some cases like where a profile is available but FG
driver skipped loading it because of force-load-profile option
DT parameter not enabled can end up showing the battery type with
a valid profile name. Handle such cases by showing that driver
had skipped loading profile which is useful.

CRs-Fixed: 2176449
Change-Id: Ic9218bf7ea5f0fb789e356b2cb90cac3d9de90f2
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent d0edcda0

drivers/power/supply/qcom/fg-core.h

+9 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, 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
@@ -86,6 +86,13 @@ 


#define MAX_CC_STEPS			20



enum prof_load_status {

	PROFILE_MISSING,

	PROFILE_LOADED,

	PROFILE_SKIPPED,

	PROFILE_NOT_LOADED,

};



/* Debug flag definitions */

enum fg_debug_flag {

	FG_IRQ			= BIT(0), /* Show interrupts */
@@ -446,6 +453,7 @@ struct fg_chip { 
	enum slope_limit_status	slope_limit_sts;

	bool			profile_available;

	bool			profile_loaded;

	enum prof_load_status	profile_load_status;

	bool			battery_missing;

	bool			fg_restarting;

	bool			charge_full;

drivers/power/supply/qcom/qpnp-fg-gen3.c

+16 −2
Original line number Diff line number Diff line
@@ -916,11 +916,16 @@ static int fg_get_prop_capacity(struct fg_chip *chip, int *val) 
#define DEFAULT_BATT_TYPE	"Unknown Battery"

#define MISSING_BATT_TYPE	"Missing Battery"

#define LOADING_BATT_TYPE	"Loading Battery"

#define SKIP_BATT_TYPE		"Skipped loading battery"

static const char *fg_get_battery_type(struct fg_chip *chip)

{

	if (chip->battery_missing)

	if (chip->battery_missing ||

		chip->profile_load_status == PROFILE_MISSING)

		return MISSING_BATT_TYPE;



	if (chip->profile_load_status == PROFILE_SKIPPED)

		return SKIP_BATT_TYPE;



	if (chip->bp.batt_type_str) {

		if (chip->profile_loaded)

			return chip->bp.batt_type_str;
@@ -2714,12 +2719,14 @@ static bool is_profile_load_required(struct fg_chip *chip) 
				buf, PROFILE_COMP_LEN, FG_IMA_DEFAULT);

		if (rc < 0) {

			pr_err("Error in reading battery profile, rc:%d\n", rc);

			chip->profile_load_status = PROFILE_SKIPPED;

			return false;

		}

		profiles_same = memcmp(chip->batt_profile, buf,

					PROFILE_COMP_LEN) == 0;

		if (profiles_same) {

			fg_dbg(chip, FG_STATUS, "Battery profile is same, not loading it\n");

			chip->profile_load_status = PROFILE_LOADED;

			return false;

		}
@@ -2733,6 +2740,7 @@ static bool is_profile_load_required(struct fg_chip *chip) 
				dump_sram(chip->batt_profile, PROFILE_LOAD_WORD,

					PROFILE_LEN);

			}

			chip->profile_load_status = PROFILE_SKIPPED;

			return false;

		}
@@ -2876,6 +2884,7 @@ static void profile_load_work(struct work_struct *work) 


	rc = fg_get_batt_profile(chip);

	if (rc < 0) {

		chip->profile_load_status = PROFILE_MISSING;

		pr_warn("profile for batt_id=%dKOhms not found..using OTP, rc:%d\n",

			chip->batt_id_ohms / 1000, rc);

		goto out;
@@ -2927,6 +2936,7 @@ static void profile_load_work(struct work_struct *work) 
	}



	fg_dbg(chip, FG_STATUS, "SOC is ready\n");

	chip->profile_load_status = PROFILE_LOADED;

done:

	rc = fg_bp_params_config(chip);

	if (rc < 0)
@@ -2952,7 +2962,10 @@ static void profile_load_work(struct work_struct *work) 


	batt_psy_initialized(chip);

	fg_notify_charger(chip);



	if (chip->profile_load_status == PROFILE_LOADED)

		chip->profile_loaded = true;



	fg_dbg(chip, FG_STATUS, "profile loaded successfully");

out:

	chip->soc_reporting_ready = true;
@@ -4312,6 +4325,7 @@ static irqreturn_t fg_batt_missing_irq_handler(int irq, void *data) 
	if (chip->battery_missing) {

		chip->profile_available = false;

		chip->profile_loaded = false;

		chip->profile_load_status = PROFILE_NOT_LOADED;

		chip->soc_reporting_ready = false;

		chip->batt_id_ohms = -EINVAL;

		cancel_delayed_work_sync(&chip->pl_enable_work);