From 2a67154543f5e64059863d38de385b0520bc90f3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 16 Jan 2023 15:53:35 +0100 Subject: [PATCH] 4.14-stable patches added patches: revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch --- ...or-out_urb-s-completion-in-pn533_usb.patch | 15 +++----- ...lpi_register-on-ulpi_read_id-timeout.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 queue-4.14/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch diff --git a/queue-4.14/nfc-pn533-wait-for-out_urb-s-completion-in-pn533_usb.patch b/queue-4.14/nfc-pn533-wait-for-out_urb-s-completion-in-pn533_usb.patch index d11ea20ed1e..7948411d81a 100644 --- a/queue-4.14/nfc-pn533-wait-for-out_urb-s-completion-in-pn533_usb.patch +++ b/queue-4.14/nfc-pn533-wait-for-out_urb-s-completion-in-pn533_usb.patch @@ -35,14 +35,12 @@ Signed-off-by: Minsuk Kang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/nfc/pn533/usb.c | 44 ++++++++++++++++++++++++++++++++++++++--- + drivers/nfc/pn533/usb.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) -diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c -index a2c9b3f3bc23..c7da364b6358 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c -@@ -165,10 +165,17 @@ static int pn533_usb_send_ack(struct pn533 *dev, gfp_t flags) +@@ -165,10 +165,17 @@ static int pn533_usb_send_ack(struct pn5 return usb_submit_urb(phy->ack_urb, flags); } @@ -60,7 +58,7 @@ index a2c9b3f3bc23..c7da364b6358 100644 int rc; if (phy->priv == NULL) -@@ -180,10 +187,17 @@ static int pn533_usb_send_frame(struct pn533 *dev, +@@ -180,10 +187,17 @@ static int pn533_usb_send_frame(struct p print_hex_dump_debug("PN533 TX: ", DUMP_PREFIX_NONE, 16, 1, out->data, out->len, false); @@ -78,7 +76,7 @@ index a2c9b3f3bc23..c7da364b6358 100644 if (dev->protocol_type == PN533_PROTO_REQ_RESP) { /* request for response for sent packet directly */ rc = pn533_submit_urb_for_response(phy, GFP_KERNEL); -@@ -424,7 +438,31 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) +@@ -424,7 +438,31 @@ static int pn533_acr122_poweron_rdr(stru return arg.rc; } @@ -111,7 +109,7 @@ index a2c9b3f3bc23..c7da364b6358 100644 { struct pn533_usb_phy *phy = urb->context; -@@ -512,10 +550,10 @@ static int pn533_usb_probe(struct usb_interface *interface, +@@ -512,10 +550,10 @@ static int pn533_usb_probe(struct usb_in usb_fill_bulk_urb(phy->out_urb, phy->udev, usb_sndbulkpipe(phy->udev, out_endpoint), @@ -124,6 +122,3 @@ index a2c9b3f3bc23..c7da364b6358 100644 switch (id->driver_info) { case PN533_DEVICE_STD: --- -2.35.1 - diff --git a/queue-4.14/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch b/queue-4.14/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch new file mode 100644 index 00000000000..03f4625549d --- /dev/null +++ b/queue-4.14/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 +@@ -214,7 +214,7 @@ static int ulpi_read_id(struct ulpi *ulp + + ret = ulpi_read(ulpi, ULPI_SCRATCH); + if (ret < 0) +- return ret; ++ goto err; + + if (ret != 0xaa) + goto err; diff --git a/queue-4.14/series b/queue-4.14/series index 2afe614c527..00e069507a4 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -335,3 +335,4 @@ edac-device-fix-period-calculation-in-edac_device_reset_delay_period.patch regulator-da9211-use-irq-handler-when-ready.patch hvc-xen-lock-console-list-traversal.patch nfc-pn533-wait-for-out_urb-s-completion-in-pn533_usb.patch +revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch -- 2.47.3