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

Commit dddb7d76 authored by Anirudh Ghayal's avatar Anirudh Ghayal Committed by Gerrit - the friendly Code Review server
Browse files

power: qpnp-qg: Allow SOC jump during resume 



If a GOOD_OCV is generated during sleep, allow the
SOC to jump to the new value if the device is in sleep
for a longer period. This is to avoid a quick drop
in SOC (due to scaling) on resume.

Change-Id: Ib4f4d5d166093298599c84459d3bd47695742e67
Signed-off-by: default avatarAnirudh Ghayal <aghayal@codeaurora.org>
parent b12e1610

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

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct qg_dt { 
	int			esr_disable_soc;

	int			esr_min_ibat_ua;

	int			shutdown_soc_threshold;

	int			min_sleep_time_secs;

	bool			hold_soc_while_full;

	bool			linearize_soc;

	bool			cl_disable;
@@ -137,6 +138,7 @@ struct qpnp_qg { 
	ktime_t			last_user_update_time;

	ktime_t			last_fifo_update_time;

	unsigned long		last_maint_soc_update_time;

	unsigned long		suspend_time;

	struct iio_channel	*batt_therm_chan;

	struct iio_channel	*batt_id_chan;

drivers/power/supply/qcom/qpnp-qg.c

+23 −6
Original line number Diff line number Diff line
@@ -3419,6 +3419,7 @@ static void qg_create_debugfs(struct qpnp_qg *chip) 
#define DEFAULT_ESR_QUAL_VBAT_UV	7000

#define DEFAULT_ESR_DISABLE_SOC		1000

#define ESR_CHG_MIN_IBAT_UA		(-450000)

#define DEFAULT_SLEEP_TIME_SECS		1800 /* 30 mins */

static int qg_parse_dt(struct qpnp_qg *chip)

{

	int rc = 0;
@@ -3659,6 +3660,12 @@ static int qg_parse_dt(struct qpnp_qg *chip) 


	chip->dt.use_s7_ocv = of_property_read_bool(node, "qcom,qg-use-s7-ocv");



	rc = of_property_read_u32(node, "qcom,min-sleep-time-secs", &temp);

	if (rc < 0)

		chip->dt.min_sleep_time_secs = DEFAULT_SLEEP_TIME_SECS;

	else

		chip->dt.min_sleep_time_secs = temp;



	/* Capacity learning params*/

	if (!chip->dt.cl_disable) {

		chip->dt.cl_feedback_on = of_property_read_bool(node,
@@ -3799,9 +3806,12 @@ static int process_suspend(struct qpnp_qg *chip) 
		chip->suspend_data = true;

	}



	qg_dbg(chip, QG_DEBUG_PM, "FIFO rt_length=%d sleep_fifo_length=%d default_s2_count=%d suspend_data=%d\n",

	get_rtc_time(&chip->suspend_time);



	qg_dbg(chip, QG_DEBUG_PM, "FIFO rt_length=%d sleep_fifo_length=%d default_s2_count=%d suspend_data=%d time=%d\n",

			fifo_rt_length, sleep_fifo_length,

			chip->dt.s2_fifo_length, chip->suspend_data);

			chip->dt.s2_fifo_length, chip->suspend_data,

			chip->suspend_time);



	return rc;

}
@@ -3811,12 +3821,15 @@ static int process_resume(struct qpnp_qg *chip) 
	u8 status2 = 0, rt_status = 0;

	u32 ocv_uv = 0, ocv_raw = 0;

	int rc;

	unsigned long rtc_sec = 0;

	unsigned long rtc_sec = 0, sleep_time_secs = 0;



	/* skip if profile is not loaded */

	if (!chip->profile_loaded)

		return 0;



	get_rtc_time(&rtc_sec);

	sleep_time_secs = rtc_sec - chip->suspend_time;



	rc = qg_read(chip, chip->qg_base + QG_STATUS2_REG, &status2, 1);

	if (rc < 0) {

		pr_err("Failed to read status2 register, rc=%d\n", rc);
@@ -3832,12 +3845,15 @@ static int process_resume(struct qpnp_qg *chip) 


		 /* Clear suspend data as there has been a GOOD OCV */

		memset(&chip->kdata, 0, sizeof(chip->kdata));

		get_rtc_time(&rtc_sec);

		chip->kdata.fifo_time = (u32)rtc_sec;

		chip->kdata.param[QG_GOOD_OCV_UV].data = ocv_uv;

		chip->kdata.param[QG_GOOD_OCV_UV].valid = true;

		chip->suspend_data = false;



		/* allow SOC jump if we have slept longer */

		if (sleep_time_secs >= chip->dt.min_sleep_time_secs)

			chip->force_soc = true;



		qg_dbg(chip, QG_DEBUG_PM, "GOOD OCV @ resume good_ocv=%d uV\n",

				ocv_uv);

	}
@@ -3850,9 +3866,10 @@ static int process_resume(struct qpnp_qg *chip) 
	}

	rt_status &= FIFO_UPDATE_DONE_INT_LAT_STS_BIT;



	qg_dbg(chip, QG_DEBUG_PM, "FIFO_DONE_STS=%d suspend_data=%d good_ocv=%d\n",

	qg_dbg(chip, QG_DEBUG_PM, "FIFO_DONE_STS=%d suspend_data=%d good_ocv=%d sleep_time=%d secs\n",

				!!rt_status, chip->suspend_data,

				chip->kdata.param[QG_GOOD_OCV_UV].valid);

				chip->kdata.param[QG_GOOD_OCV_UV].valid,

				sleep_time_secs);

	/*

	 * If this is not a wakeup from FIFO-done,

	 * process the data immediately if - we have data from