6.1-stable patches

added patches:
	revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch

diff --git a/queue-6.1/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-6.1/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch
new file mode 100644 (file)
index 0000000..6bfec4d
--- /dev/null
+++ b/queue-6.1/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch
@@ -0,0 +1,37 @@
+From b659b613cea2ae39746ca8bd2b69d1985dd9d770 Mon Sep 17 00:00:00 2001
+From: Ferry Toth <ftoth@exalondelft.nl>
+Date: Thu, 22 Dec 2022 21:53:02 +0100
+Subject: Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
+
+From: Ferry Toth <ftoth@exalondelft.nl>
+
+commit b659b613cea2ae39746ca8bd2b69d1985dd9d770 upstream.
+
+This reverts commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac.
+
+This patch results in some qemu test failures, specifically xilinx-zynq-a9
+machine and zynq-zc702 as well as zynq-zed devicetree files, when trying
+to boot from USB drive.
+
+Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/
+Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout")
+Cc: stable@vger.kernel.org
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>
+Link: https://lore.kernel.org/r/20221222205302.45761-1-ftoth@exalondelft.nl
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/common/ulpi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/common/ulpi.c
++++ b/drivers/usb/common/ulpi.c
+@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulp
+       /* Test the interface */
+       ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa);
+       if (ret < 0)
+-              return ret;
++              goto err;
+ 
+       ret = ulpi_read(ulpi, ULPI_SCRATCH);
+       if (ret < 0)

diff --git a/queue-6.1/series b/queue-6.1/series
index a934165a5b3616f506f060b013d01f1e5075d673..eb9a8f2c51b3e5135f95fee0cc6d20fd5b4b968f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -179,3 +179,4 @@ drm-i915-fix-cfi-violations-in-gt_sysfs.patch
 io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch
 io_uring-io-wq-only-free-worker-if-it-was-allocated-for-creation.patch
 block-handle-bio_split_to_limits-null-return.patch
+revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch