svn commit: r257110 - stable/10/sys/dev/usb/controller

[Hans Petter Selasky]

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;