Commit 4cd73195 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a number of small USB fixes for 4.20-rc4.

  There's the usual xhci and dwc2/3 fixes as well as a few minor other
  issues resolved for problems that have been reported. Full details are
  in the shortlog.

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

* tag 'usb-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: cdc-acm: add entry for Hiro (Conexant) modem
  usb: xhci: Prevent bus suspend if a port connect change or polling state is detected
  usb: core: Fix hub port connection events lost
  usb: dwc3: gadget: fix ISOC TRB type on unaligned transfers
  Revert "usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers"
  usb: dwc2: pci: Fix an error code in probe
  usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove()
  xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc
  usb: xhci: fix timeout for transition from RExit to U0
  usb: xhci: fix uninitialized completion when USB3 port got wrong status
  xhci: Add check for invalid byte size error when UAS devices are connected.
  xhci: handle port status events for removed USB3 hcd
  xhci: Fix leaking USB3 shared_hcd at xhci removal
  USB: misc: appledisplay: add 20" Apple Cinema Display
  USB: quirks: Add no-lpm quirk for Raydium touchscreens
  usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
  USB: Wait for extra delay time after USB_PORT_FEAT_RESET for quirky hub
  usb: dwc3: gadget: Properly check last unaligned/zero chain TRB
  usb: dwc3: core: Clean up ULPI device
parents ef4d6f2c 63529eaa

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -4713,6 +4713,8 @@ 
					prevent spurious wakeup);

				n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a

					pause after every control message);

				o = USB_QUIRK_HUB_SLOW_RESET (Hub needs extra

					delay after resetting its port);

			Example: quirks=0781:5580:bk,0a5c:5834:gij



	usbhid.mousepoll=

drivers/usb/class/cdc-acm.c

+3 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,9 @@ static const struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0572, 0x1349), /* Hiro (Conexant) USB MODEM H50228 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */

	.driver_info = QUIRK_CONTROL_LINE_STATE, },

	{ USB_DEVICE(0x2184, 0x001c) },	/* GW Instek AFG-2225 */

drivers/usb/core/hub.c

+14 −4
Original line number Diff line number Diff line
@@ -2794,6 +2794,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1, 
	int i, status;

	u16 portchange, portstatus;

	struct usb_port *port_dev = hub->ports[port1 - 1];

	int reset_recovery_time;



	if (!hub_is_superspeed(hub->hdev)) {

		if (warm) {
@@ -2849,6 +2850,8 @@ static int hub_port_reset(struct usb_hub *hub, int port1, 
					USB_PORT_FEAT_C_BH_PORT_RESET);

			usb_clear_port_feature(hub->hdev, port1,

					USB_PORT_FEAT_C_PORT_LINK_STATE);



			if (udev)

				usb_clear_port_feature(hub->hdev, port1,

					USB_PORT_FEAT_C_CONNECTION);
@@ -2885,11 +2888,18 @@ static int hub_port_reset(struct usb_hub *hub, int port1, 


done:

	if (status == 0) {

		/* TRSTRCY = 10 ms; plus some extra */

		if (port_dev->quirks & USB_PORT_QUIRK_FAST_ENUM)

			usleep_range(10000, 12000);

		else

			msleep(10 + 40);

		else {

			/* TRSTRCY = 10 ms; plus some extra */

			reset_recovery_time = 10 + 40;



			/* Hub needs extra delay after resetting its port. */

			if (hub->hdev->quirks & USB_QUIRK_HUB_SLOW_RESET)

				reset_recovery_time += 100;



			msleep(reset_recovery_time);

		}



		if (udev) {

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

drivers/usb/core/quirks.c

+14 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ static int quirks_param_set(const char *val, const struct kernel_param *kp) 
			case 'n':

				flags |= USB_QUIRK_DELAY_CTRL_MSG;

				break;

			case 'o':

				flags |= USB_QUIRK_HUB_SLOW_RESET;

				break;

			/* Ignore unrecognized flag characters */

			}

		}
@@ -380,6 +383,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x1a0a, 0x0200), .driver_info =

			USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },



	/* Terminus Technology Inc. Hub */

	{ USB_DEVICE(0x1a40, 0x0101), .driver_info = USB_QUIRK_HUB_SLOW_RESET },



	/* Corsair K70 RGB */

	{ USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -391,6 +397,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |

	  USB_QUIRK_DELAY_CTRL_MSG },



	/* Corsair K70 LUX RGB */

	{ USB_DEVICE(0x1b1c, 0x1b33), .driver_info = USB_QUIRK_DELAY_INIT },



	/* Corsair K70 LUX */

	{ USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -411,6 +420,11 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x2040, 0x7200), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },



	/* Raydium Touchscreen */

	{ USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM },



	{ USB_DEVICE(0x2386, 0x3119), .driver_info = USB_QUIRK_NO_LPM },



	/* DJI CineSSD */

	{ USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },

drivers/usb/dwc2/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static int dwc2_pci_probe(struct pci_dev *pci, 
	dwc2 = platform_device_alloc("dwc2", PLATFORM_DEVID_AUTO);

	if (!dwc2) {

		dev_err(dev, "couldn't allocate dwc2 device\n");

		ret = -ENOMEM;

		goto err;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE