drop queue-5.10/usb-ehci-prevent-missed-ehci-interrupts-with-edge-triggered-msi.patch

backport was broken, will fix it up...

diff --git a/queue-5.10/series b/queue-5.10/series
index 1e4892118a1ab1d60e47ca62c3622c286818e1c2..27bf8caec18f2f213c227c1499e38d71163534ec 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -116,7 +116,6 @@ alsa-pcm-fix-mmap-capability-check.patch
 revert-usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch
 usb-xhci-avoid-renesas_usb_fw.mem-when-it-s-unusable.patch
 xhci-fix-lost-usb-2-remote-wake.patch
-usb-ehci-prevent-missed-ehci-interrupts-with-edge-triggered-msi.patch
 kvm-ppc-book3s-fix-h_rtas-rets-buffer-overflow.patch
 kvm-ppc-book3s-hv-nested-sanitise-h_enter_nested-tm-state.patch
 usb-hub-disable-usb-3-device-initiated-lpm-if-exit-latency-is-too-high.patch

diff --git a/queue-5.10/usb-ehci-prevent-missed-ehci-interrupts-with-edge-triggered-msi.patch b/queue-5.10/usb-ehci-prevent-missed-ehci-interrupts-with-edge-triggered-msi.patch
deleted file mode 100644 (file)
index d14ff9b..0000000
--- a/queue-5.10/usb-ehci-prevent-missed-ehci-interrupts-with-edge-triggered-msi.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0b60557230adfdeb8164e0b342ac9cd469a75759 Mon Sep 17 00:00:00 2001
-From: David Jeffery <djeffery@redhat.com>
-Date: Thu, 15 Jul 2021 17:37:44 -0400
-Subject: usb: ehci: Prevent missed ehci interrupts with edge-triggered MSI
-
-From: David Jeffery <djeffery@redhat.com>
-
-commit 0b60557230adfdeb8164e0b342ac9cd469a75759 upstream.
-
-When MSI is used by the ehci-hcd driver, it can cause lost interrupts which
-results in EHCI only continuing to work due to a polling fallback. But the
-reliance of polling drastically reduces performance of any I/O through EHCI.
-
-Interrupts are lost as the EHCI interrupt handler does not safely handle
-edge-triggered interrupts. It fails to ensure all interrupt status bits are
-cleared, which works with level-triggered interrupts but not the
-edge-triggered interrupts typical from using MSI.
-
-To fix this problem, check if the driver may have raced with the hardware
-setting additional interrupt status bits and clear status until it is in a
-stable state.
-
-Fixes: 306c54d0edb6 ("usb: hcd: Try MSI interrupts on PCI devices")
-Tested-by: Laurence Oberman <loberman@redhat.com>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: David Jeffery <djeffery@redhat.com>
-Link: https://lore.kernel.org/r/20210715213744.GA44506@redhat
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/host/ehci-hcd.c |   17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -703,7 +703,8 @@ EXPORT_SYMBOL_GPL(ehci_setup);
- static irqreturn_t ehci_irq (struct usb_hcd *hcd)
- {
-       struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
--      u32                     status, masked_status, pcd_status = 0, cmd;
-+      u32                     status, current_status, masked_status, pcd_status = 0;
-+      u32                     cmd;
-       int                     bh;
-       unsigned long           flags;
- 
-@@ -715,10 +716,12 @@ static irqreturn_t ehci_irq (struct usb_
-        */
-       spin_lock_irqsave(&ehci->lock, flags);
- 
--      status = ehci_readl(ehci, &ehci->regs->status);
-+      status = 0;
-+      current_status = ehci_readl(ehci, &ehci->regs->status);
-+restart:
- 
-       /* e.g. cardbus physical eject */
--      if (status == ~(u32) 0) {
-+      if (current_status == ~(u32) 0) {
-               ehci_dbg (ehci, "device removed\n");
-               goto dead;
-       }
-@@ -727,7 +730,7 @@ static irqreturn_t ehci_irq (struct usb_
-        * We don't use STS_FLR, but some controllers don't like it to
-        * remain on, so mask it out along with the other status bits.
-        */
--      masked_status = status & (INTR_MASK | STS_FLR);
-+      masked_status = current_status & (INTR_MASK | STS_FLR);
- 
-       /* Shared IRQ? */
-       if (!masked_status || unlikely(ehci->rh_state == EHCI_RH_HALTED)) {
-@@ -737,6 +740,12 @@ static irqreturn_t ehci_irq (struct usb_
- 
-       /* clear (just) interrupts */
-       ehci_writel(ehci, masked_status, &ehci->regs->status);
-+
-+      /* For edge interrupts, don't race with an interrupt bit being raised */
-+      current_status = ehci_readl(ehci, &ehci->regs->status);
-+      if (current_status & INTR_MASK)
-+              goto restart;
-+
-       cmd = ehci_readl(ehci, &ehci->regs->command);
-       bh = 0;
-