evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "dwc3-msm: Add delay between consecutive register reads in while loop"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-24 06:13:55 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9626826f5b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/dwc3/dwc3-msm.c
View file

@ -1239,7 +1239,7 @@ static void gsi_set_clear_dbell(struct usb_ep *ep,
*/ */
static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend) static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)
{ {
u32 timeout = 1500; u32 timeout = 500;
u32 reg = 0; u32 reg = 0;
struct dwc3_ep *dep = to_dwc3_ep(ep); struct dwc3_ep *dep = to_dwc3_ep(ep);
struct dwc3 *dwc = dep->dwc; struct dwc3 *dwc = dep->dwc;
@ -1252,6 +1252,7 @@ static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)
"Unable to suspend GSI ch. WR_CTRL_STATE != 0\n"); "Unable to suspend GSI ch. WR_CTRL_STATE != 0\n");
return false; return false;
} }
usleep_range(20, 22);
} }
/* Check for U3 only if we are not handling Function Suspend */ /* Check for U3 only if we are not handling Function Suspend */
if (!f_suspend) { if (!f_suspend) {
@ -1933,6 +1934,7 @@ static int dwc3_msm_prepare_suspend(struct dwc3_msm *mdwc)
reg = dwc3_msm_read_reg(mdwc->base, PWR_EVNT_IRQ_STAT_REG); reg = dwc3_msm_read_reg(mdwc->base, PWR_EVNT_IRQ_STAT_REG);
if (reg & PWR_EVNT_LPM_IN_L2_MASK) if (reg & PWR_EVNT_LPM_IN_L2_MASK)
break; break;
usleep_range(20, 30);
} }
if (!(reg & PWR_EVNT_LPM_IN_L2_MASK)) if (!(reg & PWR_EVNT_LPM_IN_L2_MASK))
dev_err(mdwc->dev, "could not transition HS PHY to L2\n"); dev_err(mdwc->dev, "could not transition HS PHY to L2\n");