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

Pull USB / Thunderbolt fixes from Greg KH: "Here are some small USB and Thunderbolt driver fixes for 7.2-rc7 that resolve some reported issues. Included in here are: - new quirk for some broken USB devices - thunderbolt device fixes for reported issues - usb gadget driver fix - usb atm driver fix - xhci driver fixes. - other minor USB driver fixes All of these have been in linux-next this week with no reported issues" * tag 'usb-7.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: xhci: use BIT_ULL for CRCR bits to fix incorrect 64bit mask usb: quirks: Add ShanWan gamepad to quirk list usb: hub: Split announce_device() to log device identity before enumeration usb: core: Add quirk for 255-bytes initial config read usb: atm: cxacru: properly kill rcv_urb on error in cxacru_cm() usb: misc: usbio: check ibuf_len against rxbuf_len in bulk msg usb: gadget: f_ncm: Use unsigned int for ndp_index usb: cdnsp: fix incorrect endian conversions for APB timeout register thunderbolt: Initialize ->domain_released completion before it is being used thunderbolt: icm: Preserve USB4 proxy data-valid bit thunderbolt: Bound the DROM dual link port number before indexing sw->ports thunderbolt: Fix bandwidth group reservation indexing thunderbolt: stream: Unmap buffers with mapped size

Linus Torvalds committed 3 months ago

Commit 91a73db2 parents e4836b6 3d26cd115 files · +76 −28Browse files

Unified · Split

15 files

Documentation/admin-guide/kernel-parameters.txt +5 −0
drivers/thunderbolt/eeprom.c +8 −1
drivers/thunderbolt/icm.c +1 −1
drivers/thunderbolt/nhi.c +2 −2
drivers/thunderbolt/stream.c +1 −1
drivers/thunderbolt/tb.c +1 −1
drivers/usb/atm/cxacru.c +2 −0
drivers/usb/cdns3/cdnsp-gadget.c +2 −2
drivers/usb/core/config.c +24 −8
drivers/usb/core/hub.c +12 −4
drivers/usb/core/quirks.c +7 −0
drivers/usb/gadget/function/f_ncm.c +1 −1
drivers/usb/host/xhci.h +6 −6
drivers/usb/misc/usbio.c +1 −1
include/linux/usb/quirks.h +3 −0

Documentation/admin-guide/kernel-parameters.txt+5−0

 				q = USB_QUIRK_FORCE_ONE_CONFIG (Device
 					claims zero configurations,
 					forcing to 1);
+				r = USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE (Device
+					fails during initialization when asked for
+					9-bytes configuration descriptor request.
+					Ask for 255-bytes request instead to mirror
+					Windows' behavior);
 			Example: quirks=0781:5580:bk,0a5c:5834:gij
 	usbhid.mousepoll=

drivers/thunderbolt/eeprom.c+8−1

 			return -EIO;
 		}
 		port->link_nr = entry->link_nr;
-		if (entry->has_dual_link_port)
+		if (entry->has_dual_link_port) {
+			if (entry->dual_link_port_nr > sw->config.max_port_number) {
+				tb_sw_warn(sw,
+					"port entry has invalid dual link port number %u\n",
+					entry->dual_link_port_nr);
+				return -EIO;
+			}
 			port->dual_link_port =
 				&port->sw->ports[entry->dual_link_port_nr];
+		}
 	}
 	return 0;
 }

drivers/thunderbolt/icm.c+1−1

@@ -2341,7 +2341,7 @@ static int icm_usb4_switch_op(struct tb_switch sw, u16 opcode, u32 metadata, · 2340 unmodified lines
2341	if (tx_data_len) {	2341	if (tx_data_len) {
2342	request.data_len_valid \|= ICM_USB4_SWITCH_DATA_VALID;	2342	request.data_len_valid \|= ICM_USB4_SWITCH_DATA_VALID;
2343	if (tx_data_len < ARRAY_SIZE(request.data))	2343	if (tx_data_len < ARRAY_SIZE(request.data))
2344	request.data_len_valid =	2344	request.data_len_valid \|=
2345	tx_data_len & ICM_USB4_SWITCH_DATA_LEN_MASK;	2345	tx_data_len & ICM_USB4_SWITCH_DATA_LEN_MASK;
2346	memcpy(request.data, tx_data, tx_data_len * sizeof(u32));	2346	memcpy(request.data, tx_data, tx_data_len * sizeof(u32));
2347	}	2347	}

drivers/thunderbolt/nhi.c+2−2

 			return dev_err_probe(dev, res, "NHI specific init failed\n");
 	}
+	init_completion(&nhi->domain_released);
 	tb = nhi_select_cm(nhi);
 	if (!tb)
 		return dev_err_probe(dev, -ENODEV,
 	dev_dbg(dev, "NHI initialized, starting thunderbolt\n");
-	init_completion(&nhi->domain_released);
 	res = tb_domain_add(tb, host_reset);
 	if (res) {
 		/*

drivers/thunderbolt/stream.c+1−1

@@ -257,7 +257,7 @@ static void tbstream_ring_free(struct tbstream_ring *ring) · 256 unmodified lines
257		257
258	if (sf->frame.buffer_phy)	258	if (sf->frame.buffer_phy)
259	dma_unmap_page(dma_dev, sf->frame.buffer_phy,	259	dma_unmap_page(dma_dev, sf->frame.buffer_phy,
260	tb_ring_frame_size(&sf->frame), dir);	260	TB_MAX_FRAME_SIZE, dir);
261	sf->frame.buffer_phy = 0;	261	sf->frame.buffer_phy = 0;
262	if (sf->page)	262	if (sf->page)
263	__free_page(sf->page);	263	__free_page(sf->page);

drivers/thunderbolt/tb.c+1−1

@@ -609,7 +609,7 @@ static int tb_consumed_dp_bandwidth(struct tb *tb, · 608 unmodified lines
609	int *consumed_up,	609	int *consumed_up,
610	int *consumed_down)	610	int *consumed_down)
611	{	611	{
612	int group_reserved[MAX_GROUPS] = {};	612	int group_reserved[MAX_GROUPS + 1] = {};
613	struct tb_cm *tcm = tb_priv(tb);	613	struct tb_cm *tcm = tb_priv(tb);
614	struct tb_tunnel *tunnel;	614	struct tb_tunnel *tunnel;
615	bool downstream;	615	bool downstream;

drivers/usb/atm/cxacru.c+2−0

 	ret = offd;
 	usb_dbg(instance->usbatm, "cm %#x\n", cm);
 fail:
+	if (ret < 0)
+		usb_kill_urb(instance->rcv_urb);
 	mutex_unlock(&instance->cm_serialize);
 err:
 	return ret;

drivers/usb/cdns3/cdnsp-gadget.c+2−2

@@ -163,9 +163,9 @@ static void cdnsp_set_apb_timeout_value(struct cdnsp_device *pdev) · 162 unmodified lines
163	offset = cdnsp_find_next_ext_cap(base, offset, D_XEC_PRE_REGS_CAP);	163	offset = cdnsp_find_next_ext_cap(base, offset, D_XEC_PRE_REGS_CAP);
164	reg = base + offset + REG_CHICKEN_BITS_3_OFFSET;	164	reg = base + offset + REG_CHICKEN_BITS_3_OFFSET;
165		165
166	val = le32_to_cpu(readl(reg));	166	val = readl(reg);
167	val = CHICKEN_APB_TIMEOUT_SET(val, cdns->override_apb_timeout);	167	val = CHICKEN_APB_TIMEOUT_SET(val, cdns->override_apb_timeout);
168	writel(cpu_to_le32(val), reg);	168	writel(val, reg);
169	}	169	}
170		170
171	static void cdnsp_set_chicken_bits_2(struct cdnsp_device *pdev, u32 bit)	171	static void cdnsp_set_chicken_bits_2(struct cdnsp_device *pdev, u32 bit)

drivers/usb/core/config.c+24−8

 	unsigned char *bigbuffer;
 	struct usb_config_descriptor *desc;
 	int result;
+	size_t usb_config_req_size;
+	/*
+	 * We usually start by grabbing the first 9-bytes descriptor so we know
+	 * how long the whole configuration is. Some devices with quirky
+	 * firmware will fail enumeration, so if the quirk is set, use 255 instead,
+	 * mirroring the behavior of Windows.
+	 */
+	if (dev->quirks & USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE)
+		usb_config_req_size = 255;
+	else
+		usb_config_req_size = USB_DT_CONFIG_SIZE;
 	if (ncfg > USB_MAXCONFIG) {
 		dev_notice(ddev, "too many configurations: %d, "
 	if (!dev->rawdescriptors)
 		return -ENOMEM;
-	desc = kmalloc(USB_DT_CONFIG_SIZE, GFP_KERNEL);
+	desc = kmalloc(usb_config_req_size, GFP_KERNEL);
 	if (!desc)
 		return -ENOMEM;
 	for (cfgno = 0; cfgno < ncfg; cfgno++) {
-		/* We grab just the first descriptor so we know how long
-		 * the whole configuration is */
 		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
-		    desc, USB_DT_CONFIG_SIZE);
+		    desc, usb_config_req_size);
 		if (result < 0) {
 			dev_err(ddev, "unable to read config index %d "
 			    "descriptor/%s: %d\n", cfgno, "start", result);
 			dev->descriptor.bNumConfigurations = cfgno;
 			break;
 		} else if (result < 4) {
-			dev_err(ddev, "config index %d descriptor too short "
+			dev_err(ddev, "config index %d descriptor too short (asked for %zu, got %i)\n",
-			    "(expected %i, got %i)\n", cfgno,
+			    cfgno, usb_config_req_size, result);
-			    USB_DT_CONFIG_SIZE, result);
 			result = -EINVAL;
 			goto err;
 		}
 		length = max_t(int, le16_to_cpu(desc->wTotalLength),
 		    USB_DT_CONFIG_SIZE);
-		/* Now that we know the length, get the whole thing */
 		bigbuffer = kmalloc(length, GFP_KERNEL);
 		if (!bigbuffer) {
 			result = -ENOMEM;
 		if (dev->quirks & USB_QUIRK_DELAY_INIT)
 			msleep(200);
+		/* Skip the second read if we already got everything */
+		if (result >= length) {
+			memcpy(bigbuffer, desc, length);
+			goto store_and_parse;
+		}
+		/* Get the whole thing */
 		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
 		    bigbuffer, length);
 		if (result < 0) {
 			length = result;
 		}
+store_and_parse:
 		dev->rawdescriptors[cfgno] = bigbuffer;
 		result = usb_parse_configuration(dev, cfgno,

drivers/usb/core/hub.c+12−4

 	dev_info(&udev->dev, "%s: %s\n", id, string);
 }
-static void announce_device(struct usb_device *udev)
+static void announce_device_ids(struct usb_device *udev)
 {
 	u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);
 		le16_to_cpu(udev->descriptor.idVendor),
 		le16_to_cpu(udev->descriptor.idProduct),
 		bcdDevice >> 8, bcdDevice & 0xff);
+}
+static void announce_device_strings(struct usb_device *udev)
+{
 	dev_info(&udev->dev,
 		"New USB device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
 		udev->descriptor.iManufacturer,
 	show_string(udev, "SerialNumber", udev->serial);
 }
 #else
-static inline void announce_device(struct usb_device *udev) { }
+static inline void announce_device_ids(struct usb_device *udev) { }
+static inline void announce_device_strings(struct usb_device *udev) { }
 #endif
 		device_init_wakeup(&udev->dev, 0);
 	}
+	/* Announce the device identity */
+	announce_device_ids(udev);
 	/* Tell the runtime-PM framework the device is active */
 	pm_runtime_set_active(&udev->dev);
 	pm_runtime_get_noresume(&udev->dev);
 	udev->dev.devt = MKDEV(USB_DEVICE_MAJOR,
 			(((udev->bus->busnum-1) * 128) + (udev->devnum-1)));
-	/* Tell the world! */
+	/* Announce the device's product, manufacturer and serial number */
-	announce_device(udev);
+	announce_device_strings(udev);
 	if (udev->serial)
 		add_device_randomness(udev->serial, strlen(udev->serial));

drivers/usb/core/quirks.c+7−0

 				break;
 			case 'q':
 				flags |= USB_QUIRK_FORCE_ONE_CONFIG;
+				break;
+			case 'r':
+				flags |= USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE;
+				break;
 			/* Ignore unrecognized flag characters */
 			}
 		}
 	{ USB_DEVICE(0x2386, 0x350e), .driver_info = USB_QUIRK_NO_LPM },
+	/* ShanWan Wireless Gamepad */
+	{ USB_DEVICE(0x2563, 0x0575), .driver_info = USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE },
 	/* UGREEN 35871 - BOS descriptor fetch hangs at SuperSpeed Plus */
 	{ USB_DEVICE(0x2b89, 0x5871), .driver_info = USB_QUIRK_NO_BOS },

drivers/usb/gadget/function/f_ncm.c+1−1

@@ -1171,7 +1171,7 @@ static int ncm_unwrap_ntb(struct gether *port, · 1170 unmodified lines
1171	unsigned char *ntb_ptr = skb->data;	1171	unsigned char *ntb_ptr = skb->data;
1172	__le16 *tmp;	1172	__le16 *tmp;
1173	unsigned index, index2;	1173	unsigned index, index2;
1174	int ndp_index;	1174	unsigned int ndp_index;
1175	unsigned dg_len, dg_len2;	1175	unsigned dg_len, dg_len2;
1176	unsigned ndp_len;	1176	unsigned ndp_len;
1177	unsigned block_len;	1177	unsigned block_len;

drivers/usb/host/xhci.h+6−6

@@ -190,13 +190,13 @@ struct xhci_op_regs { · 189 unmodified lines
190		190
191	/* CRCR - Command Ring Control Register - cmd_ring bitmasks */	191	/* CRCR - Command Ring Control Register - cmd_ring bitmasks */
192	/* bit 0 - Cycle bit indicates the ownership of the command ring */	192	/* bit 0 - Cycle bit indicates the ownership of the command ring */
193	#define CMD_RING_CYCLE BIT(0)	193	#define CMD_RING_CYCLE BIT_ULL(0)
194	/* stop ring operation after completion of the currently executing command */	194	/* stop ring operation after completion of the currently executing command */
195	#define CMD_RING_PAUSE BIT(1)	195	#define CMD_RING_PAUSE BIT_ULL(1)
196	/* stop ring immediately - abort the currently executing command */	196	/* stop ring immediately - abort the currently executing command */
197	#define CMD_RING_ABORT BIT(2)	197	#define CMD_RING_ABORT BIT_ULL(2)
198	/* true: command ring is running */	198	/* true: command ring is running */
199	#define CMD_RING_RUNNING BIT(3)	199	#define CMD_RING_RUNNING BIT_ULL(3)
200	/* bits 63:6 - Command Ring pointer */	200	/* bits 63:6 - Command Ring pointer */
201	#define CMD_RING_PTR_MASK GENMASK_ULL(63, 6)	201	#define CMD_RING_PTR_MASK GENMASK_ULL(63, 6)
202		202
@@ -271,7 +271,7 @@ struct xhci_intr_reg { · 68 unmodified lines
271	* bit 3 - Event Handler Busy (EHB), whether the event ring is scheduled to be serviced by	271	* bit 3 - Event Handler Busy (EHB), whether the event ring is scheduled to be serviced by
272	* a work queue (or delayed service routine)?	272	* a work queue (or delayed service routine)?
273	*/	273	*/
274	#define ERST_EHB BIT(3)	274	#define ERST_EHB BIT_ULL(3)
275	/* bits 63:4 - Event Ring Dequeue Pointer */	275	/* bits 63:4 - Event Ring Dequeue Pointer */
276	#define ERST_PTR_MASK GENMASK_ULL(63, 4)	276	#define ERST_PTR_MASK GENMASK_ULL(63, 4)
277		277
@@ -502,7 +502,7 @@ struct xhci_ep_ctx { · 224 unmodified lines
502	#define CTX_TO_MAX_ESIT_PAYLOAD(p) (((p) >> 16) & 0xffff)	502	#define CTX_TO_MAX_ESIT_PAYLOAD(p) (((p) >> 16) & 0xffff)
503		503
504	/* deq bitmasks */	504	/* deq bitmasks */
505	#define EP_CTX_CYCLE_MASK BIT(0)	505	#define EP_CTX_CYCLE_MASK BIT_ULL(0)
506	/* bits 63:4 - TR Dequeue Pointer */	506	/* bits 63:4 - TR Dequeue Pointer */
507	#define TR_DEQ_PTR_MASK GENMASK_ULL(63, 4)	507	#define TR_DEQ_PTR_MASK GENMASK_ULL(63, 4)
508		508

drivers/usb/misc/usbio.c+1−1

@@ -265,7 +265,7 @@ int usbio_bulk_msg(struct auxiliary_device *adev, u8 type, u8 cmd, bool last, · 264 unmodified lines
265	lockdep_assert_held(&usbio->bulk_mutex);	265	lockdep_assert_held(&usbio->bulk_mutex);
266		266
267	if ((obuf_len > (usbio->txbuf_len - sizeof(*bpkt))) \|\|	267	if ((obuf_len > (usbio->txbuf_len - sizeof(*bpkt))) \|\|
268	(ibuf_len > (usbio->txbuf_len - sizeof(*bpkt))))	268	(ibuf_len > (usbio->rxbuf_len - sizeof(*bpkt))))
269	return -EMSGSIZE;	269	return -EMSGSIZE;
270		270
271	if (ibuf_len)	271	if (ibuf_len)

include/linux/usb/quirks.h+3−0

@@ -81,4 +81,7 @@ · 80 unmodified lines
81	/* Device claims zero configurations, forcing to 1 */	81	/* Device claims zero configurations, forcing to 1 */
82	#define USB_QUIRK_FORCE_ONE_CONFIG BIT(18)	82	#define USB_QUIRK_FORCE_ONE_CONFIG BIT(18)
83		83
		84	/* Use a 255 bytes config descriptor request mirroring windows behavior */
		85	#define USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE BIT(19)
		86
84	#endif /* __LINUX_USB_QUIRKS_H */	87	#endif /* __LINUX_USB_QUIRKS_H */

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code