Skip to content

Commit 128d849

Browse files
Xu Yanggregkh
authored andcommitted
usb: chipidea: wait controller resume finished for wakeup irq
After the chipidea driver introduce extcon for id and vbus, it's able to wakeup from another irq source, in case the system with extcon ID cable, wakeup from usb ID cable and device removal, the usb device disconnect irq may come firstly before the extcon notifier while system resume, so we will get 2 "wakeup" irq, one for usb device disconnect; and one for extcon ID cable change(real wakeup event), current driver treat them as 2 successive wakeup irq so can't handle it correctly, then finally the usb irq can't be enabled. This patch adds a check to bypass further usb events before controller resume finished to fix it. Fixes: 1f874ed ("usb: chipidea: add runtime power management support") cc: <stable@vger.kernel.org> Acked-by: Peter Chen <peter.chen@kernel.org> Signed-off-by: Xu Yang <xu.yang_2@nxp.com> Signed-off-by: Li Jun <jun.li@nxp.com> Link: https://lore.kernel.org/r/20231228110753.1755756-2-xu.yang_2@nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5dbe9ac commit 128d849

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/usb/chipidea/core.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,13 @@ static irqreturn_t ci_irq_handler(int irq, void *data)
523523
u32 otgsc = 0;
524524

525525
if (ci->in_lpm) {
526+
/*
527+
* If we already have a wakeup irq pending there,
528+
* let's just return to wait resume finished firstly.
529+
*/
530+
if (ci->wakeup_int)
531+
return IRQ_HANDLED;
532+
526533
disable_irq_nosync(irq);
527534
ci->wakeup_int = true;
528535
pm_runtime_get(ci->dev);

0 commit comments

Comments
 (0)