5.4-stable patches

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

diff --git a/queue-5.4/series b/queue-5.4/series
index 4eef5c29eb2e9890c32691dc60ba9311754e1bcd..10eb8eb4516a4f4d5822976b4c42b9f3ea715561 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -54,3 +54,5 @@ alsa-seq-oss-fix-data-race-for-max_midi_devs-access.patch
 alsa-seq-fix-data-race-at-module-auto-loading.patch
 drm-i915-glk-ecs-liva-q2-needs-glk-hdmi-port-timing-quirk.patch
 btrfs-harden-identification-of-a-stale-device.patch
+usb-dwc3-fix-phy-disable-sequence.patch
+usb-dwc3-disable-usb-core-phy-management.patch

diff --git a/queue-5.4/usb-dwc3-disable-usb-core-phy-management.patch b/queue-5.4/usb-dwc3-disable-usb-core-phy-management.patch
new file mode 100644 (file)
index 0000000..ea8a23a
--- /dev/null
+++ b/queue-5.4/usb-dwc3-disable-usb-core-phy-management.patch
@@ -0,0 +1,63 @@
+From foo@baz Tue Sep  6 02:15:10 PM CEST 2022
+From: Johan Hovold <johan@kernel.org>
+Date: Tue,  6 Sep 2022 14:07:02 +0200
+Subject: usb: dwc3: disable USB core PHY management
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org>, Matthias Kaehlcke <mka@chromium.org>, stable <stable@kernel.org>
+Message-ID: <20220906120702.19219-4-johan@kernel.org>
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 6000b8d900cd5f52fbcd0776d0cc396e88c8c2ea upstream.
+
+The dwc3 driver manages its PHYs itself so the USB core PHY management
+needs to be disabled.
+
+Use the struct xhci_plat_priv hack added by commits 46034a999c07 ("usb:
+host: xhci-plat: add platform data support") and f768e718911e ("usb:
+host: xhci-plat: add priv quirk for skip PHY initialization") to
+propagate the setting for now.
+
+Fixes: 4e88d4c08301 ("usb: add a flag to skip PHY initialization to struct usb_hcd")
+Fixes: 178a0bce05cb ("usb: core: hcd: integrate the PHY wrapper into the HCD core")
+Tested-by: Matthias Kaehlcke <mka@chromium.org>
+Cc: stable <stable@kernel.org>
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Link: https://lore.kernel.org/r/20220825131836.19769-1-johan+linaro@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+[ johan: adjust context to 5.15 ]
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/dwc3/host.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/usb/dwc3/host.c
++++ b/drivers/usb/dwc3/host.c
+@@ -9,8 +9,13 @@
+ 
+ #include <linux/platform_device.h>
+ 
++#include "../host/xhci-plat.h"
+ #include "core.h"
+ 
++static const struct xhci_plat_priv dwc3_xhci_plat_priv = {
++      .quirks = XHCI_SKIP_PHY_INIT,
++};
++
+ static int dwc3_host_get_irq(struct dwc3 *dwc)
+ {
+       struct platform_device  *dwc3_pdev = to_platform_device(dwc->dev);
+@@ -85,6 +90,11 @@ int dwc3_host_init(struct dwc3 *dwc)
+               goto err;
+       }
+ 
++      ret = platform_device_add_data(xhci, &dwc3_xhci_plat_priv,
++                                      sizeof(dwc3_xhci_plat_priv));
++      if (ret)
++              goto err;
++
+       memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props));
+ 
+       if (dwc->usb3_lpm_capable)

diff --git a/queue-5.4/usb-dwc3-fix-phy-disable-sequence.patch b/queue-5.4/usb-dwc3-fix-phy-disable-sequence.patch
new file mode 100644 (file)
index 0000000..2463eea
--- /dev/null
+++ b/queue-5.4/usb-dwc3-fix-phy-disable-sequence.patch
@@ -0,0 +1,84 @@
+From foo@baz Tue Sep  6 02:15:10 PM CEST 2022
+From: Johan Hovold <johan@kernel.org>
+Date: Tue,  6 Sep 2022 14:07:00 +0200
+Subject: usb: dwc3: fix PHY disable sequence
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org>, Andrew Halaney <ahalaney@redhat.com>, Matthias Kaehlcke <mka@chromium.org>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Message-ID: <20220906120702.19219-2-johan@kernel.org>
+
+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
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+[ johan: adjust context to 5.15 ]
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/dwc3/core.c |   19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -694,15 +694,16 @@ static void dwc3_core_exit(struct dwc3 *
+ {
+       dwc3_event_buffers_cleanup(dwc);
+ 
++      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);
+ 
+-      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);
+       clk_bulk_disable_unprepare(dwc->num_clks, dwc->clks);
+       reset_control_assert(dwc->reset);
+ }
+@@ -1537,16 +1538,16 @@ err5:
+       dwc3_debugfs_exit(dwc);
+       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: