| Message ID | 20210324071142.42264-1-tony@atomide.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 92af4fc6ec331228aca322ca37c8aea7b150a151 |
| Headers | show |
| Series | [RESEND] usb: musb: Fix suspend with devices connected for a64 | expand |
On Wed, Mar 24, 2021 at 09:11:41AM +0200, Tony Lindgren wrote: > Pinephone running on Allwinner A64 fails to suspend with USB devices > connected as reported by Bhushan Shah <bshah@kde.org>. Reverting > commit 5fbf7a253470 ("usb: musb: fix idling for suspend after > disconnect interrupt") fixes the issue. > > Let's add suspend checks also for suspend after disconnect interrupt > quirk handling like we already do elsewhere. > > Fixes: 5fbf7a253470 ("usb: musb: fix idling for suspend after disconnect interrupt") > Reported-by: Bhushan Shah <bshah@kde.org> > Tested-by: Bhushan Shah <bshah@kde.org> > Signed-off-by: Tony Lindgren <tony@atomide.com> > > --- > > Looks like this fix is still pending, can you guys please apply? This is also > needed on am335x to suspend with devices connected in addition to a64 Now queued up, thanks. greg k-h
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2004,10 +2004,14 @@ static void musb_pm_runtime_check_session(struct musb *musb) MUSB_DEVCTL_HR; switch (devctl & ~s) { case MUSB_QUIRK_B_DISCONNECT_99: - musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n"); - schedule_delayed_work(&musb->irq_work, - msecs_to_jiffies(1000)); - break; + if (musb->quirk_retries && !musb->flush_irq_work) { + musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n"); + schedule_delayed_work(&musb->irq_work, + msecs_to_jiffies(1000)); + musb->quirk_retries--; + break; + } + fallthrough; case MUSB_QUIRK_B_INVALID_VBUS_91: if (musb->quirk_retries && !musb->flush_irq_work) { musb_dbg(musb,
Pinephone running on Allwinner A64 fails to suspend with USB devices connected as reported by Bhushan Shah <bshah@kde.org>. Reverting commit 5fbf7a253470 ("usb: musb: fix idling for suspend after disconnect interrupt") fixes the issue. Let's add suspend checks also for suspend after disconnect interrupt quirk handling like we already do elsewhere. Fixes: 5fbf7a253470 ("usb: musb: fix idling for suspend after disconnect interrupt") Reported-by: Bhushan Shah <bshah@kde.org> Tested-by: Bhushan Shah <bshah@kde.org> Signed-off-by: Tony Lindgren <tony@atomide.com> --- Looks like this fix is still pending, can you guys please apply? This is also needed on am335x to suspend with devices connected in addition to a64 --- drivers/usb/musb/musb_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)