4.14-stable patches

added patches:
	usb-dwc3-fix-phy-disable-sequence.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index d064d072b631d22b080c5cc72fcbe6dfcc5325a0..ebabf7776040fa36e2df5e7542bc01ab4df59d07 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -54,3 +54,4 @@ tipc-fix-shift-wrapping-bug-in-map_get.patch
 ipv6-sr-fix-out-of-bounds-read-when-setting-hmac-dat.patch
 tcp-fix-early-etimedout-after-spurious-non-sack-rto.patch
 sch_sfb-also-store-skb-len-before-calling-child-enqu.patch
+usb-dwc3-fix-phy-disable-sequence.patch

diff --git a/queue-4.14/usb-dwc3-fix-phy-disable-sequence.patch b/queue-4.14/usb-dwc3-fix-phy-disable-sequence.patch
new file mode 100644 (file)
index 0000000..41c5783
--- /dev/null
+++ b/queue-4.14/usb-dwc3-fix-phy-disable-sequence.patch
@@ -0,0 +1,80 @@
+From d2ac7bef95c9ead307801ccb6cb6dfbeb14247bf Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Thu, 4 Aug 2022 17:09:53 +0200
+Subject: usb: dwc3: fix PHY disable sequence
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit d2ac7bef95c9ead307801ccb6cb6dfbeb14247bf upstream.
+
+Generic PHYs must be powered-off before they can be tore down.
+
+Similarly, suspending legacy PHYs after having powered them off makes no
+sense.
+
+Fix the dwc3_core_exit() (e.g. called during suspend) and open-coded
+dwc3_probe() error-path sequences that got this wrong.
+
+Note that this makes dwc3_core_exit() match the dwc3_core_init() error
+path with respect to powering off the PHYs.
+
+Fixes: 03c1fd622f72 ("usb: dwc3: core: add phy cleanup for probe error handling")
+Fixes: c499ff71ff2a ("usb: dwc3: core: re-factor init and exit paths")
+Cc: stable@vger.kernel.org      # 4.8
+Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Link: https://lore.kernel.org/r/20220804151001.23612-2-johan+linaro@kernel.org
+[ johan: adjust context to 4.14 ]
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/dwc3/core.c |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -656,15 +656,15 @@ static void dwc3_core_exit(struct dwc3 *
+ {
+       dwc3_event_buffers_cleanup(dwc);
+ 
+-      usb_phy_shutdown(dwc->usb2_phy);
+-      usb_phy_shutdown(dwc->usb3_phy);
+-      phy_exit(dwc->usb2_generic_phy);
+-      phy_exit(dwc->usb3_generic_phy);
+-
+       usb_phy_set_suspend(dwc->usb2_phy, 1);
+       usb_phy_set_suspend(dwc->usb3_phy, 1);
+       phy_power_off(dwc->usb2_generic_phy);
+       phy_power_off(dwc->usb3_generic_phy);
++
++      usb_phy_shutdown(dwc->usb2_phy);
++      usb_phy_shutdown(dwc->usb3_phy);
++      phy_exit(dwc->usb2_generic_phy);
++      phy_exit(dwc->usb3_generic_phy);
+ }
+ 
+ static bool dwc3_core_is_valid(struct dwc3 *dwc)
+@@ -1288,16 +1288,16 @@ static int dwc3_probe(struct platform_de
+ err5:
+       dwc3_event_buffers_cleanup(dwc);
+ 
+-      usb_phy_shutdown(dwc->usb2_phy);
+-      usb_phy_shutdown(dwc->usb3_phy);
+-      phy_exit(dwc->usb2_generic_phy);
+-      phy_exit(dwc->usb3_generic_phy);
+-
+       usb_phy_set_suspend(dwc->usb2_phy, 1);
+       usb_phy_set_suspend(dwc->usb3_phy, 1);
+       phy_power_off(dwc->usb2_generic_phy);
+       phy_power_off(dwc->usb3_generic_phy);
+ 
++      usb_phy_shutdown(dwc->usb2_phy);
++      usb_phy_shutdown(dwc->usb3_phy);
++      phy_exit(dwc->usb2_generic_phy);
++      phy_exit(dwc->usb3_generic_phy);
++
+       dwc3_ulpi_exit(dwc);
+ 
+ err4: