From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39246 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbbJQUuN (ORCPT ); Sat, 17 Oct 2015 16:50:13 -0400 Subject: Patch "xhci: give command abortion one more chance before killing xhci" has been added to the 4.2-stable tree To: mathias.nyman@linux.intel.com, gregkh@linuxfoundation.org, plr.vincent@gmail.com Cc: , From: Date: Sat, 17 Oct 2015 13:50:12 -0700 Message-ID: <14451150121793@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled xhci: give command abortion one more chance before killing xhci 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: xhci-give-command-abortion-one-more-chance-before-killing-xhci.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 know about it. >>From a6809ffd1687b3a8c192960e69add559b9d32649 Mon Sep 17 00:00:00 2001 From: Mathias Nyman Date: Mon, 21 Sep 2015 17:46:10 +0300 Subject: xhci: give command abortion one more chance before killing xhci From: Mathias Nyman commit a6809ffd1687b3a8c192960e69add559b9d32649 upstream. We want to give the command abortion an additional try to stop the command ring before we completely hose xhci. Tested-by: Vincent Pelletier Signed-off-by: Mathias Nyman Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-ring.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -302,6 +302,15 @@ static int xhci_abort_cmd_ring(struct xh ret = xhci_handshake(&xhci->op_regs->cmd_ring, CMD_RING_RUNNING, 0, 5 * 1000 * 1000); if (ret < 0) { + /* we are about to kill xhci, give it one more chance */ + xhci_write_64(xhci, temp_64 | CMD_RING_ABORT, + &xhci->op_regs->cmd_ring); + udelay(1000); + ret = xhci_handshake(&xhci->op_regs->cmd_ring, + CMD_RING_RUNNING, 0, 3 * 1000 * 1000); + if (ret == 0) + return 0; + xhci_err(xhci, "Stopped the command ring failed, " "maybe the host is dead\n"); xhci->xhc_state |= XHCI_STATE_DYING; Patches currently in stable-queue which might be from mathias.nyman@linux.intel.com are queue-4.2/usb-xhci-exit-early-in-xhci_setup_device-if-we-re-halted-or-dying.patch queue-4.2/xhci-give-command-abortion-one-more-chance-before-killing-xhci.patch queue-4.2/usb-xhci-clear-xhci_state_dying-on-start.patch queue-4.2/xhci-move-xhci_pme_quirk-behind-ifdef-config_pm.patch queue-4.2/usb-xhci-add-support-for-urb_zero_packet-to-bulk-sg-transfers.patch queue-4.2/usb-xhci-stop-everything-on-the-first-call-to-xhci_stop.patch queue-4.2/xhci-init-command-timeout-timer-earlier-to-avoid-deleting-it-uninitialized.patch queue-4.2/usb-xhci-lock-mutex-on-xhci_stop.patch queue-4.2/xhci-change-xhci-1.0-only-restrictions-to-support-xhci-1.1.patch