usb: dwc2: host: Fix transaction errors in host mode

[ Upstream commit 92a8dd26464e1f21f1d869ec53717bd2c1200d63 ]

Added missing GUSBCFG programming in host mode, which fixes
transaction errors issue on HiKey and Altera Cyclone V boards.

These field even if was programmed in device mode (in function
dwc2_hsotg_core_init_disconnected()) will be resetting to POR values
after core soft reset applied.
So, each time when switching to host mode required to set this field
to correct value.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Grigor Tovmasyan <tovmasya@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>

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 919a321530601db9dd43af0a271cbe9e0b05a1f7..0a0cf154814bc52bb345dd0b5c6676120f06a98b 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -2268,10 +2268,22 @@ static int dwc2_core_init(struct dwc2_hsotg *hsotg, bool initial_setup)
  */
 static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
 {
-       u32 hcfg, hfir, otgctl;
+       u32 hcfg, hfir, otgctl, usbcfg;
 
        dev_dbg(hsotg->dev, "%s(%p)\n", __func__, hsotg);
 
+       /* Set HS/FS Timeout Calibration to 7 (max available value).
+        * The number of PHY clocks that the application programs in
+        * this field is added to the high/full speed interpacket timeout
+        * duration in the core to account for any additional delays
+        * introduced by the PHY. This can be required, because the delay
+        * introduced by the PHY in generating the linestate condition
+        * can vary from one PHY to another.
+        */
+       usbcfg = dwc2_readl(hsotg->regs + GUSBCFG);
+       usbcfg |= GUSBCFG_TOUTCAL(7);
+       dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
+
        /* Restart the Phy Clock */
        dwc2_writel(0, hsotg->regs + PCGCTL);