[PATCH 5.4 27/65] usb: dwc3: fix clock issue during resume in OTG mode

From: Greg Kroah-Hartman
Date: Mon Feb 08 2021 - 11:33:12 EST


From: Gary Bisson <gary.bisson@xxxxxxxxxxxxxxxxxxx>

commit 0e5a3c8284a30f4c43fd81d7285528ece74563b5 upstream.

Commit fe8abf332b8f ("usb: dwc3: support clocks and resets for DWC3
core") introduced clock support and a new function named
dwc3_core_init_for_resume() which enables the clock before calling
dwc3_core_init() during resume as clocks get disabled during suspend.

Unfortunately in this commit the DWC3_GCTL_PRTCAP_OTG case was forgotten
and therefore during resume, a platform could call dwc3_core_init()
without re-enabling the clocks first, preventing to resume properly.

So update the resume path to call dwc3_core_init_for_resume() as it
should.

Fixes: fe8abf332b8f ("usb: dwc3: support clocks and resets for DWC3 core")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Gary Bisson <gary.bisson@xxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210125161934.527820-1-gary.bisson@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/dwc3/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1718,7 +1718,7 @@ static int dwc3_resume_common(struct dwc
if (PMSG_IS_AUTO(msg))
break;

- ret = dwc3_core_init(dwc);
+ ret = dwc3_core_init_for_resume(dwc);
if (ret)
return ret;