drop xhci patch as it caused problems.

diff --git a/queue-5.10/series b/queue-5.10/series
index e2af972dc2d318c16ff1d053c036e33cb8322813..4e5fdf8e62822e1edcf1d787c167882c0521a946 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -12,7 +12,6 @@ media-dw2102-don-t-translate-i2c-read-into-write.patch
 sctp-prefer-struct_size-over-open-coded-arithmetic.patch
 firmware-dmi-stop-decoding-on-broken-entry.patch
 input-ff-core-prefer-struct_size-over-open-coded-ari.patch
-usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
 net-dsa-mv88e6xxx-correct-check-for-empty-list.patch
 media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch
 media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch

diff --git a/queue-5.10/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch b/queue-5.10/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
deleted file mode 100644 (file)
index 25e4c02..0000000
--- a/queue-5.10/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0d0e8ec00e7578ccb973e76788d477b4a572ad55 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Apr 2024 17:02:37 +0300
-Subject: usb: xhci: prevent potential failure in handle_tx_event() for
- Transfer events without TRB
-
-From: Niklas Neronin <niklas.neronin@linux.intel.com>
-
-[ Upstream commit 66cb618bf0bb82859875b00eeffaf223557cb416 ]
-
-Some transfer events don't always point to a TRB, and consequently don't
-have a endpoint ring. In these cases, function handle_tx_event() should
-not proceed, because if 'ep->skip' is set, the pointer to the endpoint
-ring is used.
-
-To prevent a potential failure and make the code logical, return after
-checking the completion code for a Transfer event without TRBs.
-
-Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
-Link: https://lore.kernel.org/r/20240429140245.3955523-11-mathias.nyman@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/host/xhci-ring.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index fbb7a5b51ef46..ff22ee5dd840d 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -2481,16 +2481,17 @@ static int handle_tx_event(struct xhci_hcd *xhci,
-                       else
-                               xhci_handle_halted_endpoint(xhci, ep, 0, NULL,
-                                                           EP_SOFT_RESET);
--                      goto cleanup;
-+                      break;
-               case COMP_RING_UNDERRUN:
-               case COMP_RING_OVERRUN:
-               case COMP_STOPPED_LENGTH_INVALID:
--                      goto cleanup;
-+                      break;
-               default:
-                       xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n",
-                                slot_id, ep_index);
-                       goto err_out;
-               }
-+              return 0;
-       }
- 
-       /* Count current td numbers if ep->skip is set */
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index d032078cf017944613427ce06ad0e8e11ab4d654..b7221c3a8b8ae873cd3893b4270dfb0010ad822d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -13,7 +13,6 @@ media-dw2102-don-t-translate-i2c-read-into-write.patch
 sctp-prefer-struct_size-over-open-coded-arithmetic.patch
 firmware-dmi-stop-decoding-on-broken-entry.patch
 input-ff-core-prefer-struct_size-over-open-coded-ari.patch
-usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
 wifi-mt76-replace-skb_put-with-skb_put_zero.patch
 net-dsa-mv88e6xxx-correct-check-for-empty-list.patch
 media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch

diff --git a/queue-5.15/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch b/queue-5.15/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
deleted file mode 100644 (file)
index 9aaac34..0000000
--- a/queue-5.15/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 97070f1f720dbf1ac212cdbe20e754b9c70262d4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Apr 2024 17:02:37 +0300
-Subject: usb: xhci: prevent potential failure in handle_tx_event() for
- Transfer events without TRB
-
-From: Niklas Neronin <niklas.neronin@linux.intel.com>
-
-[ Upstream commit 66cb618bf0bb82859875b00eeffaf223557cb416 ]
-
-Some transfer events don't always point to a TRB, and consequently don't
-have a endpoint ring. In these cases, function handle_tx_event() should
-not proceed, because if 'ep->skip' is set, the pointer to the endpoint
-ring is used.
-
-To prevent a potential failure and make the code logical, return after
-checking the completion code for a Transfer event without TRBs.
-
-Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
-Link: https://lore.kernel.org/r/20240429140245.3955523-11-mathias.nyman@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/host/xhci-ring.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index ddb5640a8bf39..16d4d2203e074 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -2695,16 +2695,17 @@ static int handle_tx_event(struct xhci_hcd *xhci,
-                       else
-                               xhci_handle_halted_endpoint(xhci, ep, 0, NULL,
-                                                           EP_SOFT_RESET);
--                      goto cleanup;
-+                      break;
-               case COMP_RING_UNDERRUN:
-               case COMP_RING_OVERRUN:
-               case COMP_STOPPED_LENGTH_INVALID:
--                      goto cleanup;
-+                      break;
-               default:
-                       xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n",
-                                slot_id, ep_index);
-                       goto err_out;
-               }
-+              return 0;
-       }
- 
-       /* Count current td numbers if ep->skip is set */
--- 
-2.43.0
-