usb: chipidea: core: add wakeup support for extcon (876d4e1e) · Commits · 戴 / test

If wakeup event occurred by extcon event, it needs to call ci_irq again since the first ci_irq calling at extcon notifier only wakes up controller, but do noop for event handling, it causes the extcon use case can't work well from low power mode. Cc: <stable@vger.kernel.org> Fixes: ("usb: chipidea: Use extcon framework for VBUS and ID detect") Reported-by:

Philippe Schenker <philippe.schenker@toradex.com> Tested-by:

Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by:

Peter Chen <peter.chen@nxp.com> Link: https://lore.kernel.org/r/20200707060601.31907-2-peter.chen@kernel.org Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/chipidea/core.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -1243,6 +1243,29 @@ static void ci_controller_suspend(struct ci_hdrc *ci)
		enable_irq(ci->irq);
		}

		/*
		* Handle the wakeup interrupt triggered by extcon connector
		* We need to call ci_irq again for extcon since the first
		* interrupt (wakeup int) only let the controller be out of
		* low power mode, but not handle any interrupts.
		*/
		static void ci_extcon_wakeup_int(struct ci_hdrc *ci)
		{
		struct ci_hdrc_cable cable_id, cable_vbus;
		u32 otgsc = hw_read_otgsc(ci, ~0);

		cable_id = &ci->platdata->id_extcon;
		cable_vbus = &ci->platdata->vbus_extcon;

		if (!IS_ERR(cable_id->edev) && ci->is_otg &&
		(otgsc & OTGSC_IDIE) && (otgsc & OTGSC_IDIS))
		ci_irq(ci->irq, ci);

		if (!IS_ERR(cable_vbus->edev) && ci->is_otg &&
		(otgsc & OTGSC_BSVIE) && (otgsc & OTGSC_BSVIS))
		ci_irq(ci->irq, ci);
		}

		static int ci_controller_resume(struct device *dev)
		{
		struct ci_hdrc *ci = dev_get_drvdata(dev);
		@@ -1275,6 +1298,7 @@ static int ci_controller_resume(struct device *dev)
		enable_irq(ci->irq);
		if (ci_otg_is_fsm_mode(ci))
		ci_otg_fsm_wakeup_by_srp(ci);
		ci_extcon_wakeup_int(ci);
		}

		return 0;

Admin message