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

Commit 6b0b3bda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are a few minor USB fixes for 4.15-rc3.

  The largest here is the Kconfig text and configuration changes for the
  USB TypeC build options that you reported during the -rc1 merge
  window. The others are all just small fixes for reported issues, as
  well as some new device ids.

  The most "interesting" of anything here is the usbip fixes as it seems
  lots of people are starting to pay attention to that driver at the
  moment. These fixes should resolve all of the reported problems as of
  now.

  Of course there are the usual xhci and gadget fixes as well, can't go
  a pull request without those...

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
  usb: xhci: fix panic in xhci_free_virt_devices_depth_first
  xhci: Don't show incorrect WARN message about events for empty rings
  usbip: fix usbip attach to find a port that matches the requested speed
  usbip: Fix USB device hang due to wrong enabling of scatter-gather
  uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
  usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
  usb: build drivers/usb/common/ when USB_SUPPORT is set
  usb: hub: Cycle HUB power when initialization fails
  USB: core: Add type-specific length check of BOS descriptors
  usb: host: fix incorrect updating of offset
  USB: ulpi: fix bus-node lookup
  USB: usbfs: Filter flags passed in from user space
  usb: add user selectable option for the whole USB Type-C Support
  usb: f_fs: Force Reserved1=1 in OS_DESC_EXT_COMPAT
  usb: gadget: core: Fix ->udc_set_speed() speed handling
  usb: gadget: allow to enable legacy drivers without USB_ETH
  usb: gadget: udc: renesas_usb3: fix number of the pipes
  usb: gadget: don't dereference g until after it has been null checked
  USB: serial: usb_debug: add new USB device id
  usb: bdc: fix platform_no_drv_owner.cocci warnings
  ...
parents 54b99370 80e45769

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ obj-$(CONFIG_TC) += tc/ 
obj-$(CONFIG_UWB)		+= uwb/

obj-$(CONFIG_USB_PHY)		+= usb/

obj-$(CONFIG_USB)		+= usb/

obj-$(CONFIG_USB_SUPPORT)	+= usb/

obj-$(CONFIG_PCI)		+= usb/

obj-$(CONFIG_USB_GADGET)	+= usb/

obj-$(CONFIG_OF)		+= usb/

drivers/usb/common/ulpi.c

+2 −2
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ static int ulpi_of_register(struct ulpi *ulpi) 
	/* Find a ulpi bus underneath the parent or the grandparent */

	parent = ulpi->dev.parent;

	if (parent->of_node)

		np = of_find_node_by_name(parent->of_node, "ulpi");

		np = of_get_child_by_name(parent->of_node, "ulpi");

	else if (parent->parent && parent->parent->of_node)

		np = of_find_node_by_name(parent->parent->of_node, "ulpi");

		np = of_get_child_by_name(parent->parent->of_node, "ulpi");

	if (!np)

		return 0;

drivers/usb/core/config.c

+24 −4
Original line number Diff line number Diff line
@@ -905,14 +905,25 @@ void usb_release_bos_descriptor(struct usb_device *dev) 
	}

}



static const __u8 bos_desc_len[256] = {

	[USB_CAP_TYPE_WIRELESS_USB] = USB_DT_USB_WIRELESS_CAP_SIZE,

	[USB_CAP_TYPE_EXT]          = USB_DT_USB_EXT_CAP_SIZE,

	[USB_SS_CAP_TYPE]           = USB_DT_USB_SS_CAP_SIZE,

	[USB_SSP_CAP_TYPE]          = USB_DT_USB_SSP_CAP_SIZE(1),

	[CONTAINER_ID_TYPE]         = USB_DT_USB_SS_CONTN_ID_SIZE,

	[USB_PTM_CAP_TYPE]          = USB_DT_USB_PTM_ID_SIZE,

};



/* Get BOS descriptor set */

int usb_get_bos_descriptor(struct usb_device *dev)

{

	struct device *ddev = &dev->dev;

	struct usb_bos_descriptor *bos;

	struct usb_dev_cap_header *cap;

	struct usb_ssp_cap_descriptor *ssp_cap;

	unsigned char *buffer;

	int length, total_len, num, i;

	int length, total_len, num, i, ssac;

	__u8 cap_type;

	int ret;



	bos = kzalloc(sizeof(struct usb_bos_descriptor), GFP_KERNEL);
@@ -965,7 +976,13 @@ int usb_get_bos_descriptor(struct usb_device *dev) 
			dev->bos->desc->bNumDeviceCaps = i;

			break;

		}

		cap_type = cap->bDevCapabilityType;

		length = cap->bLength;

		if (bos_desc_len[cap_type] && length < bos_desc_len[cap_type]) {

			dev->bos->desc->bNumDeviceCaps = i;

			break;

		}



		total_len -= length;



		if (cap->bDescriptorType != USB_DT_DEVICE_CAPABILITY) {
@@ -973,7 +990,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) 
			continue;

		}



		switch (cap->bDevCapabilityType) {

		switch (cap_type) {

		case USB_CAP_TYPE_WIRELESS_USB:

			/* Wireless USB cap descriptor is handled by wusb */

			break;
@@ -986,8 +1003,11 @@ int usb_get_bos_descriptor(struct usb_device *dev) 
				(struct usb_ss_cap_descriptor *)buffer;

			break;

		case USB_SSP_CAP_TYPE:

			dev->bos->ssp_cap =

				(struct usb_ssp_cap_descriptor *)buffer;

			ssp_cap = (struct usb_ssp_cap_descriptor *)buffer;

			ssac = (le32_to_cpu(ssp_cap->bmAttributes) &

				USB_SSP_SUBLINK_SPEED_ATTRIBS) + 1;

			if (length >= USB_DT_USB_SSP_CAP_SIZE(ssac))

				dev->bos->ssp_cap = ssp_cap;

			break;

		case CONTAINER_ID_TYPE:

			dev->bos->ss_id =

drivers/usb/core/devio.c

+9 −5
Original line number Diff line number Diff line
@@ -1442,14 +1442,18 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb 
	int number_of_packets = 0;

	unsigned int stream_id = 0;

	void *buf;



	if (uurb->flags & ~(USBDEVFS_URB_ISO_ASAP |

				USBDEVFS_URB_SHORT_NOT_OK |

	unsigned long mask =	USBDEVFS_URB_SHORT_NOT_OK |

				USBDEVFS_URB_BULK_CONTINUATION |

				USBDEVFS_URB_NO_FSBR |

				USBDEVFS_URB_ZERO_PACKET |

				USBDEVFS_URB_NO_INTERRUPT))

				USBDEVFS_URB_NO_INTERRUPT;

	/* USBDEVFS_URB_ISO_ASAP is a special case */

	if (uurb->type == USBDEVFS_URB_TYPE_ISO)

		mask |= USBDEVFS_URB_ISO_ASAP;



	if (uurb->flags & ~mask)

			return -EINVAL;



	if ((unsigned int)uurb->buffer_length >= USBFS_XFER_MAX)

		return -EINVAL;

	if (uurb->buffer_length > 0 && !uurb->buffer)

drivers/usb/core/hub.c

+9 −0
Original line number Diff line number Diff line
@@ -4948,6 +4948,15 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		usb_put_dev(udev);

		if ((status == -ENOTCONN) || (status == -ENOTSUPP))

			break;



		/* When halfway through our retry count, power-cycle the port */

		if (i == (SET_CONFIG_TRIES / 2) - 1) {

			dev_info(&port_dev->dev, "attempt power cycle\n");

			usb_hub_set_port_power(hdev, hub, port1, false);

			msleep(2 * hub_power_on_good_delay(hub));

			usb_hub_set_port_power(hdev, hub, port1, true);

			msleep(hub_power_on_good_delay(hub));

		}

	}

	if (hub->hdev->parent ||

			!hcd->driver->port_handed_over ||