UPSTREAM: usb: dwc2: Restore GUSBCFG in dwc2_get_hwparams()

Previously dwc2_get_hwparams() was changing GUSBCFG and not putting it
back the way it was (specifically it set and cleared FORCEHOSTMODE).
Since we want to move dwc2_core_reset() _before_ dwc2_get_hwparams() we
should make sure dwc2_get_hwparams() isn't messing with things in a
permanent way.

Since we're now looking at GUSBCFG, it's obvious that we shouldn't need
all the extra delays if FORCEHOSTMODE was already set.  This will avoid
some delays for any ports that have forced host mode.

Change-Id: I514aaaf77a7ee3f0871efb15e659b93b9717c5f1
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
(cherry picked from commit 991824677fe0a555394d8093b64647dbd08b89b0)

diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index ef73e498e98fc85501ff65cbeeaa20cd13ec9c4c..a39044231b6c4fcb5afc17ee3e43c8eeb93708c1 100644 (file)
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -3096,18 +3096,20 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
 
        /* Force host mode to get HPTXFSIZ / GNPTXFSIZ exact power on value */
        gusbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
-       gusbcfg |= GUSBCFG_FORCEHOSTMODE;
-       dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG);
-       usleep_range(100000, 150000);
+       if (!(gusbcfg & GUSBCFG_FORCEHOSTMODE)) {
+               dwc2_writel(gusbcfg | GUSBCFG_FORCEHOSTMODE,
+                           hsotg->regs + GUSBCFG);
+               usleep_range(100000, 150000);
+       }
 
        gnptxfsiz = dwc2_readl(hsotg->regs + GNPTXFSIZ);
        hptxfsiz = dwc2_readl(hsotg->regs + HPTXFSIZ);
        dev_dbg(hsotg->dev, "gnptxfsiz=%08x\n", gnptxfsiz);
        dev_dbg(hsotg->dev, "hptxfsiz=%08x\n", hptxfsiz);
-       gusbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
-       gusbcfg &= ~GUSBCFG_FORCEHOSTMODE;
-       dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG);
-       usleep_range(100000, 150000);
+       if (!(gusbcfg & GUSBCFG_FORCEHOSTMODE)) {
+               dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG);
+               usleep_range(100000, 150000);
+       }
 
        /* hwcfg2 */
        hw->op_mode = (hwcfg2 & GHWCFG2_OP_MODE_MASK) >>