Patch "usb: xhci: stop everything on the first call to xhci_stop" has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-xhci-stop-everything-on-the-first-call-to-xhci_stop.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Roger Quadros <[email protected]>
Date: Mon, 21 Sep 2015 17:46:14 +0300
Subject: usb: xhci: stop everything on the first call to xhci_stop

From: Roger Quadros <[email protected]>

commit 8c24d6d7b09deee3036ddc4f2b81b53b28c8f877 upstream.

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.

---
 drivers/usb/host/xhci.c |   20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

@@ -655,15 +655,6 @@ int xhci_run(struct usb_hcd *hcd)
 }
 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.
  *

@@ -678,15 +669,14 @@ void xhci_stop(struct usb_hcd *hcd)
 	u32 temp;
 	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
 
-	mutex_lock(&xhci->mutex);
-
-	if (!usb_hcd_is_primary_hcd(hcd)) {
-		xhci_only_stop_hcd(xhci->shared_hcd);
-		mutex_unlock(&xhci->mutex);
+	if (xhci->xhc_state & XHCI_STATE_HALTED)
 		return;
-	}
 
+	mutex_lock(&xhci->mutex);
 	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
 	 * (xhci_stop() could be called as part of failed init).
 	 */

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/usb-xhci-exit-early-in-xhci_setup_device-if-we-re-halted-or-dying.patch queue-4.2/usb-xhci-clear-xhci_state_dying-on-start.patch queue-4.2/usb-xhci-stop-everything-on-the-first-call-to-xhci_stop.patch queue-4.2/usb-xhci-lock-mutex-on-xhci_stop.patch