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

[Hans Petter Selasky]

Author: hselasky
Date: Fri Feb 27 12:20:03 2015
New Revision: 279353
URL: https://svnweb.freebsd.org/changeset/base/279353

Log:
  MFC r279233:
  Ensure that the XHCI driver will refresh the control endpoint settings
  when re-enumerating a FULL speed device. Else the wrong max packet
  setting might be used when trying to re-enumerate a FULL speed device.

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

Modified: stable/10/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/xhci.c	Fri Feb 27 11:13:46 2015	(r279352)
+++ stable/10/sys/dev/usb/controller/xhci.c	Fri Feb 27 12:20:03 2015	(r279353)
@@ -1415,6 +1415,13 @@ xhci_set_address(struct usb_device *udev
 
 		pepext = xhci_get_endpoint_ext(udev,
 		    &udev->ctrl_ep_desc);
+
+		/* ensure the control endpoint is setup again */
+		USB_BUS_LOCK(udev->bus);
+		pepext->trb_halted = 1;
+		pepext->trb_running = 0;
+		USB_BUS_UNLOCK(udev->bus);
+
 		err = xhci_configure_endpoint(udev,
 		    &udev->ctrl_ep_desc, pepext,
 		    0, 1, 1, 0, mps, mps, USB_EP_MODE_DEFAULT);