Commit cee853e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB/Thunderbolt fixes from Greg KH:
 "Here are a number of small USB driver fixes for 5.6-rc3.

  Included in here are:
  - MAINTAINER file updates
  - USB gadget driver fixes
  - usb core quirk additions and fixes for regressions
  - xhci driver fixes
  - usb serial driver id additions and fixes
  - thunderbolt bugfix

  Thunderbolt patches come in through here now that USB4 is really
  thunderbolt.

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

* tag 'usb-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (34 commits)
  USB: misc: iowarrior: add support for the 100 device
  thunderbolt: Prevent crash if non-active NVMem file is read
  usb: gadget: udc-xilinx: Fix xudc_stop() kernel-doc format
  USB: misc: iowarrior: add support for the 28 and 28L devices
  USB: misc: iowarrior: add support for 2 OEMed devices
  USB: Fix novation SourceControl XL after suspend
  xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2
  Revert "xhci: Fix memory leak when caching protocol extended capability PSI tables"
  MAINTAINERS: Sort entries in database for THUNDERBOLT
  usb: dwc3: debug: fix string position formatting mixup with ret and len
  usb: gadget: serial: fix Tx stall after buffer overflow
  usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
  usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows
  usb: dwc2: Fix in ISOC request length checking
  usb: gadget: composite: Support more than 500mA MaxPower
  usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
  usb: gadget: u_audio: Fix high-speed max packet size
  usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields
  USB: core: clean up endpoint-descriptor parsing
  USB: quirks: blacklist duplicate ep on Sound Devices USBPre2
  ...
parents 88f8bbfa 8b978be8

MAINTAINERS

+10 −10
Original line number Diff line number Diff line
@@ -16552,8 +16552,8 @@ M: Michael Jamet <michael.jamet@intel.com> 
M:	Mika Westerberg <mika.westerberg@linux.intel.com>

M:	Yehezkel Bernat <YehezkelShB@gmail.com>

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git

F:	Documentation/admin-guide/thunderbolt.rst

F:	drivers/thunderbolt/

F:	include/linux/thunderbolt.h
@@ -17392,11 +17392,14 @@ F: drivers/usb/ 
F:	include/linux/usb.h

F:	include/linux/usb/













USB TYPEC PI3USB30532 MUX DRIVER













M:	Hans de Goede <hdegoede@redhat.com>













USB TYPEC BUS FOR ALTERNATE MODES













M:	Heikki Krogerus <heikki.krogerus@linux.intel.com>















L:	linux-usb@vger.kernel.org















S:	Maintained













F:	drivers/usb/typec/mux/pi3usb30532.c













F:	Documentation/ABI/testing/sysfs-bus-typec













F:	Documentation/driver-api/usb/typec_bus.rst













F:	drivers/usb/typec/altmodes/













F:	include/linux/usb/typec_altmode.h





























USB TYPEC CLASS















M:	Heikki Krogerus <heikki.krogerus@linux.intel.com>









@@ -17407,14 +17410,11 @@ F:	Documentation/driver-api/usb/typec.rst













F:	drivers/usb/typec/















F:	include/linux/usb/typec.h



























USB TYPEC BUS FOR ALTERNATE MODES













M:	Heikki Krogerus <heikki.krogerus@linux.intel.com>













USB TYPEC PI3USB30532 MUX DRIVER













M:	Hans de Goede <hdegoede@redhat.com>















L:	linux-usb@vger.kernel.org















S:	Maintained













F:	Documentation/ABI/testing/sysfs-bus-typec













F:	Documentation/driver-api/usb/typec_bus.rst













F:	drivers/usb/typec/altmodes/













F:	include/linux/usb/typec_altmode.h













F:	drivers/usb/typec/mux/pi3usb30532.c





























USB TYPEC PORT CONTROLLER DRIVERS















M:	Guenter Roeck <linux@roeck-us.net>

































drivers/thunderbolt/switch.c



+7
−0






























Original line number
Diff line number
Diff line








@@ -348,6 +348,12 @@ out:













	return ret;















}





























static int tb_switch_nvm_no_read(void *priv, unsigned int offset, void *val,













				 size_t bytes)













{













	return -EPERM;













}





























static int tb_switch_nvm_write(void *priv, unsigned int offset, void *val,















			       size_t bytes)















{










@@ -393,6 +399,7 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id,













		config.read_only = true;















	} else {















		config.name = "nvm_non_active";













		config.reg_read = tb_switch_nvm_no_read;















		config.reg_write = tb_switch_nvm_write;















		config.root_only = true;















	}

































drivers/usb/core/config.c



+19
−12






























Original line number
Diff line number
Diff line








@@ -256,6 +256,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













		struct usb_host_interface *ifp, int num_ep,















		unsigned char *buffer, int size)















{













	struct usb_device *udev = to_usb_device(ddev);















	unsigned char *buffer0 = buffer;















	struct usb_endpoint_descriptor *d;















	struct usb_host_endpoint *endpoint;










@@ -297,6 +298,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













		goto skip_to_next_endpoint_or_interface_descriptor;















	}





























	/* Ignore blacklisted endpoints */













	if (udev->quirks & USB_QUIRK_ENDPOINT_BLACKLIST) {













		if (usb_endpoint_is_blacklisted(udev, ifp, d)) {













			dev_warn(ddev, "config %d interface %d altsetting %d has a blacklisted endpoint with address 0x%X, skipping\n",













					cfgno, inum, asnum,













					d->bEndpointAddress);













			goto skip_to_next_endpoint_or_interface_descriptor;













		}













	}





























	endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];















	++ifp->desc.bNumEndpoints;

























@@ -311,7 +322,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













	j = 255;















	if (usb_endpoint_xfer_int(d)) {















		i = 1;













		switch (to_usb_device(ddev)->speed) {













		switch (udev->speed) {















		case USB_SPEED_SUPER_PLUS:















		case USB_SPEED_SUPER:















		case USB_SPEED_HIGH:









@@ -332,8 +343,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













			/*















			 * This quirk fixes bIntervals reported in ms.















			 */













			if (to_usb_device(ddev)->quirks &













				USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL) {













			if (udev->quirks & USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL) {















				n = clamp(fls(d->bInterval) + 3, i, j);















				i = j = n;















			}









@@ -341,8 +351,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













			 * This quirk fixes bIntervals reported in















			 * linear microframes.















			 */













			if (to_usb_device(ddev)->quirks &













				USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL) {













			if (udev->quirks & USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL) {















				n = clamp(fls(d->bInterval), i, j);















				i = j = n;















			}









@@ -359,7 +368,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













	} else if (usb_endpoint_xfer_isoc(d)) {















		i = 1;















		j = 16;













		switch (to_usb_device(ddev)->speed) {













		switch (udev->speed) {















		case USB_SPEED_HIGH:















			n = 7;		/* 8 ms = 2^(7-1) uframes */















			break;









@@ -381,8 +390,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













	 * explicitly forbidden by the USB spec.  In an attempt to make















	 * them usable, we will try treating them as Interrupt endpoints.















	 */













	if (to_usb_device(ddev)->speed == USB_SPEED_LOW &&













			usb_endpoint_xfer_bulk(d)) {













	if (udev->speed == USB_SPEED_LOW && usb_endpoint_xfer_bulk(d)) {















		dev_warn(ddev, "config %d interface %d altsetting %d "















		    "endpoint 0x%X is Bulk; changing to Interrupt\n",















		    cfgno, inum, asnum, d->bEndpointAddress);









@@ -406,7 +414,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,





























	/* Find the highest legal maxpacket size for this endpoint */















	i = 0;		/* additional transactions per microframe */













	switch (to_usb_device(ddev)->speed) {













	switch (udev->speed) {















	case USB_SPEED_LOW:















		maxpacket_maxes = low_speed_maxpacket_maxes;















		break;










@@ -442,8 +450,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













	 * maxpacket sizes other than 512.  High speed HCDs may not















	 * be able to handle that particular bug, so let's warn...















	 */













	if (to_usb_device(ddev)->speed == USB_SPEED_HIGH













			&& usb_endpoint_xfer_bulk(d)) {













	if (udev->speed == USB_SPEED_HIGH && usb_endpoint_xfer_bulk(d)) {















		if (maxp != 512)















			dev_warn(ddev, "config %d interface %d altsetting %d "















				"bulk endpoint 0x%X has invalid maxpacket %d\n",









@@ -452,7 +459,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,













	}































	/* Parse a possible SuperSpeed endpoint companion descriptor */













	if (to_usb_device(ddev)->speed >= USB_SPEED_SUPER)













	if (udev->speed >= USB_SPEED_SUPER)















		usb_parse_ss_endpoint_companion(ddev, cfgno,















				inum, asnum, endpoint, buffer, size);

















































drivers/usb/core/hub.c



+15
−5






























Original line number
Diff line number
Diff line








@@ -38,7 +38,9 @@













#include "otg_whitelist.h"































#define USB_VENDOR_GENESYS_LOGIC		0x05e3













#define USB_VENDOR_SMSC				0x0424















#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01













#define HUB_QUIRK_DISABLE_AUTOSUSPEND		0x02































#define USB_TP_TRANSMISSION_DELAY	40	/* ns */















#define USB_TP_TRANSMISSION_DELAY_MAX	65535	/* ns */










@@ -1217,11 +1219,6 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)













#ifdef CONFIG_PM















			udev->reset_resume = 1;















#endif













			/* Don't set the change_bits when the device













			 * was powered off.













			 */













			if (test_bit(port1, hub->power_bits))













				set_bit(port1, hub->change_bits);































		} else {















			/* The power session is gone; tell hub_wq */










@@ -1731,6 +1728,10 @@ static void hub_disconnect(struct usb_interface *intf)













	kfree(hub->buffer);































	pm_suspend_ignore_children(&intf->dev, false);



























	if (hub->quirk_disable_autosuspend)













		usb_autopm_put_interface(intf);





























	kref_put(&hub->kref, hub_release);















}


























@@ -1863,6 +1864,11 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)













	if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)















		hub->quirk_check_port_auto_suspend = 1;





























	if (id->driver_info & HUB_QUIRK_DISABLE_AUTOSUSPEND) {













		hub->quirk_disable_autosuspend = 1;













		usb_autopm_get_interface(intf);













	}





























	if (hub_configure(hub, &desc->endpoint[0].desc) >= 0)















		return 0;


























@@ -5599,6 +5605,10 @@ out_hdev_lock:













}































static const struct usb_device_id hub_id_table[] = {













    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_CLASS,













      .idVendor = USB_VENDOR_SMSC,













      .bInterfaceClass = USB_CLASS_HUB,













      .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},















    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR















			| USB_DEVICE_ID_MATCH_INT_CLASS,















      .idVendor = USB_VENDOR_GENESYS_LOGIC,

































drivers/usb/core/hub.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -61,6 +61,7 @@ struct usb_hub {













	unsigned		quiescing:1;















	unsigned		disconnected:1;















	unsigned		in_reset:1;













	unsigned		quirk_disable_autosuspend:1;































	unsigned		quirk_check_port_auto_suspend:1;

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE