From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 25 10:20:20 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 75EF59EA;
 Fri, 25 Oct 2013 10:20:20 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 627192BC0;
 Fri, 25 Oct 2013 10:20:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PAKKY2007638;
 Fri, 25 Oct 2013 10:20:20 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PAKKPP007615;
 Fri, 25 Oct 2013 10:20:20 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201310251020.r9PAKKPP007615@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 25 Oct 2013 10:20:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257110 - stable/10/sys/dev/usb/controller
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 10:20:20 -0000

Author: hselasky
Date: Fri Oct 25 10:20:19 2013
New Revision: 257110
URL: http://svnweb.freebsd.org/changeset/base/257110

Log:
  MFC r256750:
  Improve XHCI stability. When a command timeout happens, the command
  should be aborted else the command queue can stop. Refer to section
  "4.6.1.2" of the XHCI specification.
  
  Approved by:	re (glebius)

Modified:
  stable/10/sys/dev/usb/controller/xhci.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/xhci.c	Fri Oct 25 09:09:00 2013	(r257109)
+++ stable/10/sys/dev/usb/controller/xhci.c	Fri Oct 25 10:20:19 2013	(r257110)
@@ -1144,6 +1144,25 @@ xhci_do_command(struct xhci_softc *sc, s
 	}
 	if (err != 0) {
 		DPRINTFN(0, "Command timeout!\n");
+
+		/*
+		 * Try to abort the last command as per section
+		 * 4.6.1.2 "Aborting a Command" of the XHCI
+		 * specification:
+		 */
+		temp = XREAD4(sc, oper, XHCI_CRCR_LO);
+		XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CA);
+
+		/* wait for abort event, if any */
+		err = cv_timedwait(&sc->sc_cmd_cv, &sc->sc_bus.bus_mtx, hz / 16);
+
+		if (err != 0 && xhci_interrupt_poll(sc) != 0) {
+			DPRINTF("Command was completed when polling\n");
+			err = 0;
+		}
+		if (err != 0) {
+			DPRINTF("Command abort timeout!\n");
+		}
 		err = USB_ERR_TIMEOUT;
 		trb->dwTrb2 = 0;
 		trb->dwTrb3 = 0;