aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Petrosyan <Arthur.Petrosyan@synopsys.com>2018-05-23 09:26:08 -0400
committerFelipe Balbi <felipe.balbi@linux.intel.com>2018-06-19 05:48:12 -0400
commit22bb5cfdf13ae70c6a34508a16cfeee48f162443 (patch)
tree07c54d46f0aecca3fd84acf2786b0db440c439b6
parent9925e6ebe5c2da9601037cca73462782900b9190 (diff)
usb: dwc2: Fix host exit from hibernation flow.
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>
-rw-r--r--drivers/usb/dwc2/hcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index edaf0b6af4f0..bae08a7d7abd 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -5435,7 +5435,7 @@ int dwc2_host_enter_hibernation(struct dwc2_hsotg *hsotg)
5435 dwc2_writel(hprt0, hsotg->regs + HPRT0); 5435 dwc2_writel(hprt0, hsotg->regs + HPRT0);
5436 5436
5437 /* Wait for the HPRT0.PrtSusp register field to be set */ 5437 /* Wait for the HPRT0.PrtSusp register field to be set */
5438 if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 300)) 5438 if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 3000))
5439 dev_warn(hsotg->dev, "Suspend wasn't generated\n"); 5439 dev_warn(hsotg->dev, "Suspend wasn't generated\n");
5440 5440
5441 /* 5441 /*
@@ -5616,6 +5616,8 @@ int dwc2_host_exit_hibernation(struct dwc2_hsotg *hsotg, int rem_wakeup,
5616 return ret; 5616 return ret;
5617 } 5617 }
5618 5618
5619 dwc2_hcd_rem_wakeup(hsotg);
5620
5619 hsotg->hibernated = 0; 5621 hsotg->hibernated = 0;
5620 hsotg->bus_suspended = 0; 5622 hsotg->bus_suspended = 0;
5621 hsotg->lx_state = DWC2_L0; 5623 hsotg->lx_state = DWC2_L0;