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

Merge tag 'usb-5.9-rc6' 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 one Thunderbolt driver fixes.

  Nothing major at all, just some fixes for reported issues, and a quirk
  addition:

   - typec fixes

   - UAS disconnect fix

   - usblp race fix

   - ehci-hcd modversions build fix

   - ignore wakeup quirk table addition

   - thunderbolt DROM read fix

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

* tag 'usb-5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usblp: fix race between disconnect() and read()
  ehci-hcd: Move include to keep CRC stable
  usb: typec: intel_pmc_mux: Handle SCU IPC error conditions
  USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook
  USB: UAS: fix disconnect by unplugging a hub
  usb: typec: ucsi: Prevent mode overrun
  usb: typec: ucsi: acpi: Increase command completion timeout value
  thunderbolt: Retry DROM read once if parsing fails
parents f44f3f83 9cdabcb3

drivers/thunderbolt/eeprom.c

+16 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/crc32.h>

#include <linux/delay.h>

#include <linux/property.h>

#include <linux/slab.h>

#include "tb.h"
@@ -389,8 +390,8 @@ static int tb_drom_parse_entries(struct tb_switch *sw) 
		struct tb_drom_entry_header *entry = (void *) (sw->drom + pos);

		if (pos + 1 == drom_size || pos + entry->len > drom_size

				|| !entry->len) {

			tb_sw_warn(sw, "drom buffer overrun, aborting\n");

			return -EIO;

			tb_sw_warn(sw, "DROM buffer overrun\n");

			return -EILSEQ;

		}



		switch (entry->type) {
@@ -526,7 +527,8 @@ int tb_drom_read(struct tb_switch *sw) 
	u16 size;

	u32 crc;

	struct tb_drom_header *header;

	int res;

	int res, retries = 1;



	if (sw->drom)

		return 0;
@@ -612,7 +614,17 @@ parse: 
		tb_sw_warn(sw, "drom device_rom_revision %#x unknown\n",

			header->device_rom_revision);



	return tb_drom_parse_entries(sw);

	res = tb_drom_parse_entries(sw);

	/* If the DROM parsing fails, wait a moment and retry once */

	if (res == -EILSEQ && retries--) {

		tb_sw_warn(sw, "parsing DROM failed, retrying\n");

		msleep(100);

		res = tb_drom_read_n(sw, 0, sw->drom, size);

		if (!res)

			goto parse;

	}



	return res;

err:

	kfree(sw->drom);

	sw->drom = NULL;

drivers/usb/class/usblp.c

+5 −0
Original line number Diff line number Diff line
@@ -827,6 +827,11 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t len, lo 
	if (rv < 0)

		return rv;



	if (!usblp->present) {

		count = -ENODEV;

		goto done;

	}



	if ((avail = usblp->rstatus) < 0) {

		printk(KERN_ERR "usblp%d: error %d reading from printer\n",

		    usblp->minor, (int)avail);

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -397,6 +397,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Generic RTL8153 based ethernet adapters */

	{ USB_DEVICE(0x0bda, 0x8153), .driver_info = USB_QUIRK_NO_LPM },



	/* SONiX USB DEVICE Touchpad */

	{ USB_DEVICE(0x0c45, 0x7056), .driver_info =

			USB_QUIRK_IGNORE_REMOTE_WAKEUP },



	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/host/ehci-hcd.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/interrupt.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>

#include <linux/usb/otg.h>

#include <linux/moduleparam.h>

#include <linux/dma-mapping.h>

#include <linux/debugfs.h>

drivers/usb/host/ehci-hub.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 */



/*-------------------------------------------------------------------------*/

#include <linux/usb/otg.h>



#define	PORT_WAKE_BITS	(PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)

CRA Git | Maintained and supported by SUSTech CRA and CCSE