Merge "power: battery: fix FCC stepper calculation" (e4ff7e88) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/power/supply/qcom/battery.c

+55 −2

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ struct pl_data {
		int parallel_step_fcc_count;
		int parallel_step_fcc_residual;
		int step_fcc;
		int override_main_fcc_ua;
		int total_fcc_ua;
		u32 wa_flags;
		struct class qcom_batt_class;
		struct wakeup_source *pl_ws;
		@@ -192,6 +194,9 @@ static int cp_get_parallel_mode(struct pl_data *chip, int mode)
		*/
		static void cp_configure_ilim(struct pl_data chip, const char voter, int ilim)
		{
		int rc, fcc;
		union power_supply_propval pval = {0, };

		if (!is_cp_available(chip))
		return;

		@@ -199,12 +204,29 @@ static void cp_configure_ilim(struct pl_data chip, const char voter, int ilim)
		== POWER_SUPPLY_PL_OUTPUT_VPH)
		return;

		rc = power_supply_get_property(chip->cp_master_psy,
		POWER_SUPPLY_PROP_MIN_ICL, &pval);
		if (rc < 0)
		return;

		if (!chip->cp_ilim_votable)
		chip->cp_ilim_votable = find_votable("CP_ILIM");

		if (chip->cp_ilim_votable)
		if (chip->cp_ilim_votable) {
		fcc = get_effective_result_locked(chip->fcc_votable);
		/*
		* If FCC >= (2 * MIN_ICL) then it is safe to enable CP
		* with MIN_ICL.
		* Configure ILIM as follows:
		* if request_ilim < MIN_ICL cofigure ILIM to MIN_ICL.
		* otherwise configure ILIM to requested_ilim.
		*/
		if ((fcc >= (pval.intval * 2)) && (ilim < pval.intval))
		vote(chip->cp_ilim_votable, voter, true, pval.intval);
		else
		vote(chip->cp_ilim_votable, voter, true, ilim);
		}
		}

		/*******
		* ICL *
		@@ -601,11 +623,34 @@ static void get_main_fcc_config(struct pl_data chip, int total_fcc)
		static void get_fcc_stepper_params(struct pl_data *chip, int main_fcc_ua,
		int parallel_fcc_ua)
		{
		int main_set_fcc_ua, total_fcc_ua;

		if (!chip->fcc_step_size_ua) {
		pr_err("Invalid fcc stepper step size, value 0\n");
		return;
		}

		if (is_override_vote_enabled_locked(chip->fcc_main_votable)) {
		/*
		* FCC stepper params need re-calculation in override mode
		* only if there is change in Main or total FCC
		*/

		main_set_fcc_ua = get_effective_result_locked(
		chip->fcc_main_votable);
		total_fcc_ua = main_fcc_ua + parallel_fcc_ua;

		if ((main_set_fcc_ua != chip->override_main_fcc_ua)
		\|\| (total_fcc_ua != chip->total_fcc_ua)) {
		chip->override_main_fcc_ua = main_set_fcc_ua;
		chip->total_fcc_ua = total_fcc_ua;
		parallel_fcc_ua = (total_fcc_ua
		- chip->override_main_fcc_ua);
		} else {
		goto skip_fcc_step_update;
		}
		}

		/* Read current FCC of main charger */
		chip->main_fcc_ua = get_effective_result(chip->fcc_main_votable);
		chip->main_step_fcc_dir = (main_fcc_ua > chip->main_fcc_ua) ?
		@@ -622,6 +667,7 @@ static void get_fcc_stepper_params(struct pl_data *chip, int main_fcc_ua,
		chip->parallel_step_fcc_residual = abs((parallel_fcc_ua -
		chip->slave_fcc_ua) % chip->fcc_step_size_ua);

		skip_fcc_step_update:
		if (chip->parallel_step_fcc_count \|\| chip->parallel_step_fcc_residual
		\|\| chip->main_step_fcc_count \|\| chip->main_step_fcc_residual)
		chip->step_fcc = 1;
		@@ -1344,6 +1390,13 @@ static int pl_disable_vote_callback(struct votable *votable,
		if (chip->step_fcc) {
		vote(chip->pl_awake_votable, FCC_STEPPER_VOTER,
		true, 0);
		/*
		* Configure ILIM above min ILIM of CP to
		* ensure CP is not disabled due to ILIM vote.
		* Later FCC stepper will take to ILIM to
		* target value.
		*/
		cp_configure_ilim(chip, FCC_VOTER, 0);
		schedule_delayed_work(&chip->fcc_stepper_work,
		0);
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1326,6 +1326,8 @@ static int smb5_usb_main_set_prop(struct power_supply *psy,
		case POWER_SUPPLY_PROP_FORCE_MAIN_FCC:
		vote_override(chg->fcc_main_votable, CC_MODE_VOTER,
		(val->intval < 0) ? false : true, val->intval);
		/* Main FCC updated re-calculate FCC */
		rerun_election(chg->fcc_votable);
		break;
		case POWER_SUPPLY_PROP_FORCE_MAIN_ICL:
		vote_override(chg->usb_icl_votable, CC_MODE_VOTER,