Fix for dwc3 (rhbz 1753099)

2 files changed, 86 insertions, 0 deletions

diff --git a/dwc3-fix.patch b/dwc3-fix.patch
new file mode 100644
index 000000000..d741b9e2e
--- /dev/null
+++ b/dwc3-fix.patch
@@ -0,0 +1,80 @@
+From 4749e0e61241cc121de572520a39dab365b9ea1d Mon Sep 17 00:00:00 2001
+From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
+Date: Thu, 8 Aug 2019 16:39:42 -0700
+Subject: usb: dwc3: Update soft-reset wait polling rate
+
+Starting from DWC_usb31 version 1.90a and later, the DCTL.CSFRST bit
+will not be cleared until after all the internal clocks are synchronized
+during soft-reset. This may take a little more than 50ms. Set the
+polling rate at 20ms instead.
+
+Signed-off-by: Thinh Nguyen <thinhn@synopsys.com>
+Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
+---
+ drivers/usb/dwc3/core.c | 23 ++++++++++++++++++-----
+ drivers/usb/dwc3/core.h |  2 ++
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
+index 98bce85c29d0..252c397860ef 100644
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -252,12 +252,25 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
+ 	reg |= DWC3_DCTL_CSFTRST;
+ 	dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+ 
++	/*
++	 * For DWC_usb31 controller 1.90a and later, the DCTL.CSFRST bit
++	 * is cleared only after all the clocks are synchronized. This can
++	 * take a little more than 50ms. Set the polling rate at 20ms
++	 * for 10 times instead.
++	 */
++	if (dwc3_is_usb31(dwc) && dwc->revision >= DWC3_USB31_REVISION_190A)
++		retries = 10;
++
+ 	do {
+ 		reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+ 		if (!(reg & DWC3_DCTL_CSFTRST))
+ 			goto done;
+ 
+-		udelay(1);
++		if (dwc3_is_usb31(dwc) &&
++		    dwc->revision >= DWC3_USB31_REVISION_190A)
++			msleep(20);
++		else
++			udelay(1);
+ 	} while (--retries);
+ 
+ 	phy_exit(dwc->usb3_generic_phy);
+@@ -267,11 +280,11 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
+ 
+ done:
+ 	/*
+-	 * For DWC_usb31 controller, once DWC3_DCTL_CSFTRST bit is cleared,
+-	 * we must wait at least 50ms before accessing the PHY domain
+-	 * (synchronization delay). DWC_usb31 programming guide section 1.3.2.
++	 * For DWC_usb31 controller 1.80a and prior, once DCTL.CSFRST bit
++	 * is cleared, we must wait at least 50ms before accessing the PHY
++	 * domain (synchronization delay).
+ 	 */
+-	if (dwc3_is_usb31(dwc))
++	if (dwc3_is_usb31(dwc) && dwc->revision <= DWC3_USB31_REVISION_180A)
+ 		msleep(50);
+ 
+ 	return 0;
+diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
+index 3dd783b889cb..1c8b349379af 100644
+--- a/drivers/usb/dwc3/core.h
++++ b/drivers/usb/dwc3/core.h
+@@ -1137,6 +1137,8 @@ struct dwc3 {
+ #define DWC3_USB31_REVISION_120A	(0x3132302a | DWC3_REVISION_IS_DWC31)
+ #define DWC3_USB31_REVISION_160A	(0x3136302a | DWC3_REVISION_IS_DWC31)
+ #define DWC3_USB31_REVISION_170A	(0x3137302a | DWC3_REVISION_IS_DWC31)
++#define DWC3_USB31_REVISION_180A	(0x3138302a | DWC3_REVISION_IS_DWC31)
++#define DWC3_USB31_REVISION_190A	(0x3139302a | DWC3_REVISION_IS_DWC31)
+ 
+ 	u32			version_type;
+ 
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/kernel.spec b/kernel.spec
index 107fcbccf..3520009a7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -593,6 +593,9 @@ Patch516: technisat-usb2-break-out-of-loop-at-end-of-buffer.patch
 # CVE-2019-14821 rhbz 1746708 1753596
 Patch517: kvm-coalesced_mmio-add-bounds-checking.patch
 
+# rhbz 1753099
+Patch518: dwc3-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1830,6 +1833,9 @@ fi
 #
 #
 %changelog
+* Thu Sep 19 2019 Laura Abbott <labbott@redhat.com>
+- Fix for dwc3 (rhbz 1753099)
+
 * Thu Sep 19 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.16-200
 - Linux v5.2.16
 - Fix CVE-2019-14821 (rhbz 1746708 1753596)