svn commit: r279233 - head/sys/dev/usb/controller

[Hans Petter Selasky]

Author: hselasky
Date: Tue Feb 24 08:53:47 2015
New Revision: 279233
URL: https://svnweb.freebsd.org/changeset/base/279233

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/sys/dev/usb/controller/xhci.c

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Tue Feb 24 06:20:50 2015	(r279232)
+++ head/sys/dev/usb/controller/xhci.c	Tue Feb 24 08:53:47 2015	(r279233)
@@ -1411,6 +1411,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);