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

Commit f1757531 authored by Ashay Jaiswal's avatar Ashay Jaiswal
Browse files

power: smb5: add votables to enable/disable interrupts 



Convert all the interrupts which are dynamically enabled/disabled
at runtime into votables to keep them balanced.

Change-Id: I46eaf84c7b582db1b665f5151fc866b0fdf330a2
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
parent 3002fe4f

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

+4 −3
Original line number Diff line number Diff line
@@ -2730,7 +2730,6 @@ static int smb5_post_init(struct smb5 *chip) 
		return rc;

	}



	rerun_election(chg->usb_irq_enable_votable);



	return 0;

}
@@ -3070,6 +3069,7 @@ static int smb5_request_interrupt(struct smb5 *chip, 
	irq_data->storm_data = smb5_irqs[irq_index].storm_data;

	mutex_init(&irq_data->storm_data.storm_lock);



	smb5_irqs[irq_index].enabled = true;

	rc = devm_request_threaded_irq(chg->dev, irq, NULL,

					smb5_irqs[irq_index].handler,

					IRQF_ONESHOT, irq_name, irq_data);
@@ -3103,8 +3103,6 @@ static int smb5_request_interrupts(struct smb5 *chip) 
				return rc;

		}

	}

	if (chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq)

		chg->usb_icl_change_irq_enabled = true;



	/*

	 * WDOG_SNARL_IRQ is required for SW Thermal Regulation WA. In case
@@ -3119,6 +3117,9 @@ static int smb5_request_interrupts(struct smb5 *chip) 
		disable_irq_nosync(chg->irq_info[WDOG_SNARL_IRQ].irq);

	}



	vote(chg->limited_irq_disable_votable, CHARGER_TYPE_VOTER, true, 0);

	vote(chg->hdc_irq_disable_votable, CHARGER_TYPE_VOTER, true, 0);



	return rc;

}

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

+110 −38
Original line number Diff line number Diff line
@@ -727,14 +727,9 @@ int smblib_set_charge_param(struct smb_charger *chg, 
int smblib_set_usb_suspend(struct smb_charger *chg, bool suspend)

{

	int rc = 0;

	int irq = chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq;



	if (suspend && irq) {

		if (chg->usb_icl_change_irq_enabled) {

			disable_irq_nosync(irq);

			chg->usb_icl_change_irq_enabled = false;

		}

	}

	if (suspend)

		vote(chg->icl_irq_disable_votable, USB_SUSPEND_VOTER,

				true, 0);



	rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT,

				 suspend ? USBIN_SUSPEND_BIT : 0);
@@ -742,12 +737,9 @@ int smblib_set_usb_suspend(struct smb_charger *chg, bool suspend) 
		smblib_err(chg, "Couldn't write %s to USBIN_SUSPEND_BIT rc=%d\n",

			suspend ? "suspend" : "resume", rc);



	if (!suspend && irq) {

		if (!chg->usb_icl_change_irq_enabled) {

			enable_irq(irq);

			chg->usb_icl_change_irq_enabled = true;

		}

	}

	if (!suspend)

		vote(chg->icl_irq_disable_votable, USB_SUSPEND_VOTER,

				false, 0);



	return rc;

}
@@ -1135,6 +1127,10 @@ static void smblib_uusb_removal(struct smb_charger *chg) 
	vote(chg->usb_icl_votable, HVDCP2_ICL_VOTER, false, 0);

	vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, false, 0);

	vote(chg->usb_icl_votable, THERMAL_THROTTLE_VOTER, false, 0);

	vote(chg->limited_irq_disable_votable, CHARGER_TYPE_VOTER,

			true, 0);

	vote(chg->hdc_irq_disable_votable, CHARGER_TYPE_VOTER, true, 0);

	vote(chg->hdc_irq_disable_votable, HDC_IRQ_VOTER, false, 0);



	/* Remove SW thermal regulation WA votes */

	vote(chg->usb_icl_votable, SW_THERM_REGULATION_VOTER, false, 0);
@@ -1582,24 +1578,70 @@ static int smblib_chg_disable_vote_callback(struct votable *votable, void *data, 
	return 0;

}



static int smblib_usb_irq_enable_vote_callback(struct votable *votable,

				void *data, int enable, const char *client)

static int smblib_hdc_irq_disable_vote_callback(struct votable *votable,

				void *data, int disable, const char *client)

{

	struct smb_charger *chg = data;



	if (!chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].irq ||

				!chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

	if (!chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

		return 0;



	if (enable) {

		enable_irq(chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].irq);

		enable_irq(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	if (chg->irq_info[HIGH_DUTY_CYCLE_IRQ].enabled) {

		if (disable)

			disable_irq_nosync(

				chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	} else {

		if (!disable)

			enable_irq(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	}



	chg->irq_info[HIGH_DUTY_CYCLE_IRQ].enabled = !disable;



	return 0;

}



static int smblib_limited_irq_disable_vote_callback(struct votable *votable,

				void *data, int disable, const char *client)

{

	struct smb_charger *chg = data;



	if (!chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].irq)

		return 0;



	if (chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].enabled) {

		if (disable)

			disable_irq_nosync(

				chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].irq);

		disable_irq_nosync(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	} else {

		if (!disable)

			enable_irq(

				chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].irq);

	}



	chg->irq_info[INPUT_CURRENT_LIMITING_IRQ].enabled = !disable;



	return 0;

}



static int smblib_icl_irq_disable_vote_callback(struct votable *votable,

				void *data, int disable, const char *client)

{

	struct smb_charger *chg = data;



	if (!chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq)

		return 0;



	if (chg->irq_info[USBIN_ICL_CHANGE_IRQ].enabled) {

		if (disable)

			disable_irq_nosync(

				chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq);

	} else {

		if (!disable)

			enable_irq(chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq);

	}



	chg->irq_info[USBIN_ICL_CHANGE_IRQ].enabled = !disable;



	return 0;

}
@@ -3963,7 +4005,10 @@ int smblib_set_prop_pd_active(struct smb_charger *chg, 
	update_sw_icl_max(chg, apsd->pst);



	if (chg->pd_active) {

		vote(chg->usb_irq_enable_votable, PD_VOTER, true, 0);

		vote(chg->limited_irq_disable_votable, CHARGER_TYPE_VOTER,

				false, 0);

		vote(chg->hdc_irq_disable_votable, CHARGER_TYPE_VOTER,

				false, 0);



		/*

		 * Enforce 100mA for PD until the real vote comes in later.
@@ -3989,7 +4034,10 @@ int smblib_set_prop_pd_active(struct smb_charger *chg, 
		}

	} else {

		vote(chg->usb_icl_votable, PD_VOTER, false, 0);

		vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);

		vote(chg->limited_irq_disable_votable, CHARGER_TYPE_VOTER,

				true, 0);

		vote(chg->hdc_irq_disable_votable, CHARGER_TYPE_VOTER,

				true, 0);



		sec_charger = chg->sec_pl_present ?

						POWER_SUPPLY_CHARGER_SEC_PL :
@@ -4811,7 +4859,10 @@ static void smblib_handle_hvdcp_check_timeout(struct smb_charger *chg, 


		if (qc_charger) {

			/* enable HDC and ICL irq for QC2/3 charger */

			vote(chg->usb_irq_enable_votable, QC_VOTER, true, 0);

			vote(chg->limited_irq_disable_votable,

					CHARGER_TYPE_VOTER, false, 0);

			vote(chg->hdc_irq_disable_votable,

					CHARGER_TYPE_VOTER, false, 0);

			vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true,

				HVDCP_CURRENT_UA);

		} else {
@@ -5195,8 +5246,10 @@ static void typec_src_removal(struct smb_charger *chg) 
	vote(chg->usb_icl_votable, THERMAL_THROTTLE_VOTER, false, 0);



	/* reset usb irq voters */

	vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);

	vote(chg->usb_irq_enable_votable, QC_VOTER, false, 0);

	vote(chg->limited_irq_disable_votable, CHARGER_TYPE_VOTER,

			true, 0);

	vote(chg->hdc_irq_disable_votable, CHARGER_TYPE_VOTER, true, 0);

	vote(chg->hdc_irq_disable_votable, HDC_IRQ_VOTER, false, 0);



	/* reset parallel voters */

	vote(chg->pl_disable_votable, PL_DELAY_VOTER, true, 0);
@@ -5557,8 +5610,7 @@ irqreturn_t high_duty_cycle_irq_handler(int irq, void *data) 
	 * the flag cleared in the delayed work queue, to avoid any IRQ

	 * storming during the delays

	 */

	if (chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

		disable_irq_nosync(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	vote(chg->hdc_irq_disable_votable, HDC_IRQ_VOTER, true, 0);



	schedule_delayed_work(&chg->clear_hdc_work, msecs_to_jiffies(60));
@@ -5913,8 +5965,7 @@ static void clear_hdc_work(struct work_struct *work) 
						clear_hdc_work.work);



	chg->is_hdc = 0;

	if (chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

		enable_irq(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

	vote(chg->hdc_irq_disable_votable, HDC_IRQ_VOTER, false, 0);

}



static void smblib_icl_change_work(struct work_struct *work)
@@ -6542,13 +6593,34 @@ static int smblib_create_votables(struct smb_charger *chg) 
		return rc;

	}



	chg->usb_irq_enable_votable = create_votable("USB_IRQ_DISABLE",

	chg->limited_irq_disable_votable = create_votable(

				"USB_LIMITED_IRQ_DISABLE",

				VOTE_SET_ANY,

				smblib_limited_irq_disable_vote_callback,

				chg);

	if (IS_ERR(chg->limited_irq_disable_votable)) {

		rc = PTR_ERR(chg->limited_irq_disable_votable);

		chg->limited_irq_disable_votable = NULL;

		return rc;

	}



	chg->hdc_irq_disable_votable = create_votable("USB_HDC_IRQ_DISABLE",

					VOTE_SET_ANY,

					smblib_hdc_irq_disable_vote_callback,

					chg);

	if (IS_ERR(chg->hdc_irq_disable_votable)) {

		rc = PTR_ERR(chg->hdc_irq_disable_votable);

		chg->hdc_irq_disable_votable = NULL;

		return rc;

	}



	chg->icl_irq_disable_votable = create_votable("USB_ICL_IRQ_DISABLE",

					VOTE_SET_ANY,

					smblib_usb_irq_enable_vote_callback,

					smblib_icl_irq_disable_vote_callback,

					chg);

	if (IS_ERR(chg->usb_irq_enable_votable)) {

		rc = PTR_ERR(chg->usb_irq_enable_votable);

		chg->usb_irq_enable_votable = NULL;

	if (IS_ERR(chg->icl_irq_disable_votable)) {

		rc = PTR_ERR(chg->icl_irq_disable_votable);

		chg->icl_irq_disable_votable = NULL;

		return rc;

	}

drivers/power/supply/qcom/smb5-lib.h

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ enum print_reason { 
#define THERMAL_THROTTLE_VOTER		"THERMAL_THROTTLE_VOTER"

#define VOUT_VOTER			"VOUT_VOTER"

#define DR_SWAP_VOTER			"DR_SWAP_VOTER"

#define USB_SUSPEND_VOTER		"USB_SUSPEND_VOTER"

#define CHARGER_TYPE_VOTER		"CHARGER_TYPE_VOTER"

#define HDC_IRQ_VOTER			"HDC_IRQ_VOTER"



#define BOOST_BACK_STORM_COUNT	3

#define WEAK_CHG_STORM_COUNT	8
@@ -232,6 +235,7 @@ struct smb_irq_info { 
	const struct storm_watch	storm_data;

	struct smb_irq_data		*irq_data;

	int				irq;

	bool				enabled;

};



static const unsigned int smblib_extcon_cable[] = {
@@ -406,9 +410,11 @@ struct smb_charger { 
	struct votable		*pl_disable_votable;

	struct votable		*chg_disable_votable;

	struct votable		*pl_enable_votable_indirect;

	struct votable		*usb_irq_enable_votable;

	struct votable		*cp_disable_votable;

	struct votable		*smb_override_votable;

	struct votable		*icl_irq_disable_votable;

	struct votable		*limited_irq_disable_votable;

	struct votable		*hdc_irq_disable_votable;



	/* work */

	struct work_struct	bms_update_work;