Commit fe81f354 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

usb: ohci: Prevent missed ohci interrupts

Testing ohci functionality with qemu's pci-ohci emulation often results
in ohci interface stalls, resulting in hung task timeouts.

The problem is caused by lost interrupts between the emulation and the
Linux kernel code. Additional interrupts raised while the ohci interrupt
handler in Linux is running and before the handler clears the interrupt
status are not handled. The fix for a similar problem in ehci suggests
that the problem is likely caused by edge-triggered MSI interrupts. See
commit 0b605572 ("usb: ehci: Prevent missed ehci interrupts with
edge-triggered MSI") for details.

Ensure that the ohci interrupt code handles all pending interrupts before
returning to solve the problem.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: David Laight <David.Laight@aculab.com>
Cc: stable@vger.kernel.org
Fixes: 306c54d0 ("usb: hcd: Try MSI interrupts on PCI devices")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: https://lore.kernel.org/r/20240429154010.1507366-1-linux@roeck-us.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2004e82
...@@ -888,6 +888,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) ...@@ -888,6 +888,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
/* Check for an all 1's result which is a typical consequence /* Check for an all 1's result which is a typical consequence
* of dead, unclocked, or unplugged (CardBus...) devices * of dead, unclocked, or unplugged (CardBus...) devices
*/ */
again:
if (ints == ~(u32)0) { if (ints == ~(u32)0) {
ohci->rh_state = OHCI_RH_HALTED; ohci->rh_state = OHCI_RH_HALTED;
ohci_dbg (ohci, "device removed!\n"); ohci_dbg (ohci, "device removed!\n");
...@@ -982,6 +983,13 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) ...@@ -982,6 +983,13 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
} }
spin_unlock(&ohci->lock); spin_unlock(&ohci->lock);
/* repeat until all enabled interrupts are handled */
if (ohci->rh_state != OHCI_RH_HALTED) {
ints = ohci_readl(ohci, &regs->intrstatus);
if (ints && (ints & ohci_readl(ohci, &regs->intrenable)))
goto again;
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment