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 5e6cec3ac4953c2fe5c4dffab22007b0f6f4f4cf..b822774872e24f530c60c9e54854f51366a8cc1f 100644 (file)
--- 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 <johan+linaro@kernel.org>
 Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 (file)
index 0000000..6bfec4d
--- /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 <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-4.19/series b/queue-4.19/series
index c17b1e043b3a74db83a753c0ea9cb7a23e30a8b1..03aea80fc9f3920b7f54c90a355456e9fcfd3c44 100644 (file)
--- 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