Merge "smb-lib: fix usbin_icl_change interrupt storm" (0fda0080) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/qpnp-smb2.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1847,6 +1847,12 @@ static int smb2_post_init(struct smb2 *chip)
		struct smb_charger *chg = &chip->chg;
		int rc;

		/* In case the usb path is suspended, we would have missed disabling
		* the icl change interrupt because the interrupt could have been
		* not requested
		*/
		rerun_election(chg->usb_icl_votable);

		/* configure power role for dual-role */
		rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,
		TYPEC_POWER_ROLE_CMD_MASK, 0);
		@@ -2196,6 +2202,8 @@ static int smb2_request_interrupts(struct smb2 *chip)
		return rc;
		}
		}
		if (chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq)
		chg->usb_icl_change_irq_enabled = true;

		return rc;
		}

+15 −2

Original line number	Diff line number	Diff line
		@@ -427,6 +427,14 @@ static int step_charge_soc_update(struct smb_charger *chg, int capacity)
		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;
		}
		}

		rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT,
		suspend ? USBIN_SUSPEND_BIT : 0);
		@@ -434,6 +442,13 @@ 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;
		}
		}

		return rc;
		}

		@@ -885,7 +900,6 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua)
		if (icl_ua < USBIN_25MA)
		return smblib_set_usb_suspend(chg, true);

		disable_irq_nosync(chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq);
		if (icl_ua == INT_MAX)
		goto override_suspend_config;

		@@ -943,7 +957,6 @@ override_suspend_config:
		}

		enable_icl_changed_interrupt:
		enable_irq(chg->irq_info[USBIN_ICL_CHANGE_IRQ].irq);
		return rc;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ struct smb_charger {
		int fake_input_current_limited;
		bool pr_swap_in_progress;
		int typec_mode;
		int usb_icl_change_irq_enabled;

		/* workaround flag */
		u32 wa_flags;