Commit 8c24d6d7 authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman

usb: xhci: stop everything on the first call to xhci_stop

xhci_stop will be called twice, once for the shared hcd
and again for the primary hcd.

We stop the XHCI controller in any case so clean up
everything on the first call else we can timeout
waiting for pending requests to complete.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5bfeab0
...@@ -655,15 +655,6 @@ int xhci_run(struct usb_hcd *hcd) ...@@ -655,15 +655,6 @@ int xhci_run(struct usb_hcd *hcd)
} }
EXPORT_SYMBOL_GPL(xhci_run); EXPORT_SYMBOL_GPL(xhci_run);
static void xhci_only_stop_hcd(struct usb_hcd *hcd)
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
spin_lock_irq(&xhci->lock);
xhci_halt(xhci);
spin_unlock_irq(&xhci->lock);
}
/* /*
* Stop xHCI driver. * Stop xHCI driver.
* *
...@@ -678,15 +669,14 @@ void xhci_stop(struct usb_hcd *hcd) ...@@ -678,15 +669,14 @@ void xhci_stop(struct usb_hcd *hcd)
u32 temp; u32 temp;
struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_hcd *xhci = hcd_to_xhci(hcd);
mutex_lock(&xhci->mutex); if (xhci->xhc_state & XHCI_STATE_HALTED)
if (!usb_hcd_is_primary_hcd(hcd)) {
xhci_only_stop_hcd(xhci->shared_hcd);
mutex_unlock(&xhci->mutex);
return; return;
}
mutex_lock(&xhci->mutex);
spin_lock_irq(&xhci->lock); spin_lock_irq(&xhci->lock);
xhci->xhc_state |= XHCI_STATE_HALTED;
xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
/* Make sure the xHC is halted for a USB3 roothub /* Make sure the xHC is halted for a USB3 roothub
* (xhci_stop() could be called as part of failed init). * (xhci_stop() could be called as part of failed init).
*/ */
......
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