Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a2424f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-usb-linus' of... 

Merge branch 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

* 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
  USB: Fix up URB error codes to reflect implementation.
  xhci: Always set urb->status to zero for isoc endpoints.
  xhci: Add reset on resume quirk for asrock p67 host
  xHCI 1.0: Incompatible Device Error
  xHCI 1.0: Force Stopped Event(FSE)
  xhci: Don't warn about zeroed bMaxBurst descriptor field.
  USB: Free bandwidth when usb_disable_device is called.
  xhci: Reject double add of active endpoints.
parents 0af212ba a9e75863

Documentation/usb/error-codes.txt

+8 −1
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ A transfer's actual_length may be positive even when an error has been 
reported.  That's because transfers often involve several packets, so that

one or more packets could finish before an error stops further endpoint I/O.



For isochronous URBs, the urb status value is non-zero only if the URB is

unlinked, the device is removed, the host controller is disabled, or the total

transferred length is less than the requested length and the URB_SHORT_NOT_OK

flag is set.  Completion handlers for isochronous URBs should only see

urb->status set to zero, -ENOENT, -ECONNRESET, -ESHUTDOWN, or -EREMOTEIO.

Individual frame descriptor status fields may report more status codes.





0			Transfer completed successfully
@@ -132,7 +139,7 @@ one or more packets could finish before an error stops further endpoint I/O. 
			device removal events immediately.



-EXDEV			ISO transfer only partially completed

			look at individual frame status for details

			(only set in iso_frame_desc[n].status, not urb->status)



-EINVAL			ISO madness, if this happens: Log off and go home

drivers/usb/core/hub.c

+3 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,7 @@ void usb_disconnect(struct usb_device **pdev) 
{

	struct usb_device	*udev = *pdev;

	int			i;

	struct usb_hcd		*hcd = bus_to_hcd(udev->bus);



	if (!udev) {

		pr_debug ("%s nodev\n", __func__);
@@ -1661,7 +1662,9 @@ void usb_disconnect(struct usb_device **pdev) 
	 * so that the hardware is now fully quiesced.

	 */

	dev_dbg (&udev->dev, "unregistering device\n");

	mutex_lock(hcd->bandwidth_mutex);

	usb_disable_device(udev, 0);

	mutex_unlock(hcd->bandwidth_mutex);

	usb_hcd_synchronize_unlinks(udev);



	usb_remove_ep_devs(&udev->ep0);

drivers/usb/core/message.c

+14 −1
Original line number Diff line number Diff line
@@ -1135,10 +1135,13 @@ void usb_disable_interface(struct usb_device *dev, struct usb_interface *intf, 
 * Deallocates hcd/hardware state for the endpoints (nuking all or most

 * pending urbs) and usbcore state for the interfaces, so that usbcore

 * must usb_set_configuration() before any interfaces could be used.

 *

 * Must be called with hcd->bandwidth_mutex held.

 */

void usb_disable_device(struct usb_device *dev, int skip_ep0)

{

	int i;

	struct usb_hcd *hcd = bus_to_hcd(dev->bus);



	/* getting rid of interfaces will disconnect

	 * any drivers bound to them (a key side effect)
@@ -1172,6 +1175,16 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 


	dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__,

		skip_ep0 ? "non-ep0" : "all");

	if (hcd->driver->check_bandwidth) {

		/* First pass: Cancel URBs, leave endpoint pointers intact. */

		for (i = skip_ep0; i < 16; ++i) {

			usb_disable_endpoint(dev, i, false);

			usb_disable_endpoint(dev, i + USB_DIR_IN, false);

		}

		/* Remove endpoints from the host controller internal state */

		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);

		/* Second pass: remove endpoint pointers */

	}

	for (i = skip_ep0; i < 16; ++i) {

		usb_disable_endpoint(dev, i, true);

		usb_disable_endpoint(dev, i + USB_DIR_IN, true);
@@ -1727,6 +1740,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
	/* if it's already configured, clear out old state first.

	 * getting rid of old interfaces means unbinding their drivers.

	 */

	mutex_lock(hcd->bandwidth_mutex);

	if (dev->state != USB_STATE_ADDRESS)

		usb_disable_device(dev, 1);	/* Skip ep0 */
@@ -1739,7 +1753,6 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
	 * host controller will not allow submissions to dropped endpoints.  If

	 * this call fails, the device state is unchanged.

	 */

	mutex_lock(hcd->bandwidth_mutex);

	ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);

	if (ret < 0) {

		mutex_unlock(hcd->bandwidth_mutex);

drivers/usb/host/xhci-mem.c

+0 −2
Original line number Diff line number Diff line
@@ -1215,8 +1215,6 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, 
		ep_ctx->ep_info2 |= cpu_to_le32(MAX_PACKET(max_packet));

		/* dig out max burst from ep companion desc */

		max_packet = ep->ss_ep_comp.bMaxBurst;

		if (!max_packet)

			xhci_warn(xhci, "WARN no SS endpoint bMaxBurst\n");

		ep_ctx->ep_info2 |= cpu_to_le32(MAX_BURST(max_packet));

		break;

	case USB_SPEED_HIGH:

drivers/usb/host/xhci-pci.c

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73

#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000



#define PCI_VENDOR_ID_ETRON		0x1b6f

#define PCI_DEVICE_ID_ASROCK_P67	0x7023



static const char hcd_name[] = "xhci_hcd";



/* called after powerup, by probe or system-pm "wakeup" */
@@ -134,6 +137,11 @@ static int xhci_pci_setup(struct usb_hcd *hcd) 
		xhci->quirks |= XHCI_EP_LIMIT_QUIRK;

		xhci->limit_active_eps = 64;

	}

	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&

			pdev->device == PCI_DEVICE_ID_ASROCK_P67) {

		xhci->quirks |= XHCI_RESET_ON_RESUME;

		xhci_dbg(xhci, "QUIRK: Resetting on resume\n");

	}



	/* Make sure the HC is halted. */

	retval = xhci_halt(xhci);