4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artur Petrosyan Arthur.Petrosyan@synopsys.com
[ Upstream commit 22bb5cfdf13ae70c6a34508a16cfeee48f162443 ]
In case when a hub is connected to DWC2 host auto suspend occurs and host goes to hibernation. When any device connected to hub host hibernation exiting incorrectly.
- Added dwc2_hcd_rem_wakeup() function call to exit from suspend state by remote wakeup.
- Increase timeout value for port suspend bit to be set.
Acked-by: Minas Harutyunyan hminas@synopsys.com Signed-off-by: Artur Petrosyan arturp@synopsys.com Signed-off-by: Felipe Balbi felipe.balbi@linux.intel.com Signed-off-by: Sasha Levin alexander.levin@microsoft.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/usb/dwc2/hcd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -5437,7 +5437,7 @@ int dwc2_host_enter_hibernation(struct d dwc2_writel(hprt0, hsotg->regs + HPRT0);
/* Wait for the HPRT0.PrtSusp register field to be set */ - if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 300)) + if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 3000)) dev_warn(hsotg->dev, "Suspend wasn't generated\n");
/* @@ -5618,6 +5618,8 @@ int dwc2_host_exit_hibernation(struct dw return ret; }
+ dwc2_hcd_rem_wakeup(hsotg); + hsotg->hibernated = 0; hsotg->bus_suspended = 0; hsotg->lx_state = DWC2_L0;