From: Greg Kroah-Hartman Date: Mon, 16 Jan 2023 14:53:46 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.14.303~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29aed7428362629f8afa144d11fb0772d3e45213;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch --- diff --git a/queue-4.19/efi-fix-null-deref-in-init-error-path.patch b/queue-4.19/efi-fix-null-deref-in-init-error-path.patch index 5e6cec3ac49..b822774872e 100644 --- a/queue-4.19/efi-fix-null-deref-in-init-error-path.patch +++ b/queue-4.19/efi-fix-null-deref-in-init-error-path.patch @@ -21,11 +21,9 @@ Signed-off-by: Johan Hovold Signed-off-by: Ard Biesheuvel Signed-off-by: Sasha Levin --- - drivers/firmware/efi/efi.c | 9 ++++++--- + drivers/firmware/efi/efi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index f0ef2643b70e..c966a23de85d 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -359,8 +359,8 @@ static int __init efisubsys_init(void) @@ -39,7 +37,7 @@ index f0ef2643b70e..c966a23de85d 100644 } error = generic_ops_register(); -@@ -396,7 +396,10 @@ static int __init efisubsys_init(void) +@@ -396,7 +396,10 @@ err_unregister: generic_ops_unregister(); err_put: kobject_put(efi_kobj); @@ -51,6 +49,3 @@ index f0ef2643b70e..c966a23de85d 100644 return error; } --- -2.35.1 - diff --git a/queue-4.19/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-4.19/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch new file mode 100644 index 00000000000..6bfec4d0b70 --- /dev/null +++ b/queue-4.19/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-4.19/series b/queue-4.19/series index c17b1e043b3..03aea80fc9f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -514,3 +514,4 @@ x86-resctrl-fix-task-closid-rmid-update-race.patch drm-virtio-fix-gem-handle-creation-uaf.patch arm64-cmpxchg_double-hazard-against-entire-exchange-.patch efi-fix-null-deref-in-init-error-path.patch +revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch