From: Greg Kroah-Hartman Date: Mon, 16 Jan 2023 14:54:19 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v4.14.303~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69662d2bad773c6806d54d22d0c4223873a92e0f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..6bfec4d0b70 --- /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 +Date: Thu, 22 Dec 2022 21:53:02 +0100 +Subject: Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" + +From: Ferry Toth + +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 +Signed-off-by: Ferry Toth +Link: https://lore.kernel.org/r/20221222205302.45761-1-ftoth@exalondelft.nl +Signed-off-by: Greg Kroah-Hartman +--- + 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 a934165a5b3..eb9a8f2c51b 100644 --- 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