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

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 5.6-rc7. And there's a thunderbolt
  driver fix thrown in for good measure as well.

  These fixes are:
   - new device ids for usb-serial drivers
   - thunderbolt error code fix
   - xhci driver fixes
   - typec fixes
   - cdc-acm driver fixes
   - chipidea driver fix
   - more USB quirks added for devices that need them.

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

* tag 'usb-5.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: cdc-acm: fix rounding error in TIOCSSERIAL
  USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL
  usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters
  usb: chipidea: udc: fix sleeping function called from invalid context
  USB: serial: pl2303: add device-id for HP LD381
  USB: serial: option: add ME910G1 ECM composition 0x110b
  usb: host: xhci-plat: add a shutdown
  usb: typec: ucsi: displayport: Fix a potential race during registration
  usb: typec: ucsi: displayport: Fix NULL pointer dereference
  USB: Disable LPM on WD19's Realtek Hub
  usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c
  xhci: Do not open code __print_symbolic() in xhci trace events
  thunderbolt: Fix error code in tb_port_is_width_supported()
parents fa91418b 2866ce86

drivers/thunderbolt/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static bool tb_port_is_width_supported(struct tb_port *port, int width) 
	ret = tb_port_read(port, &phy, TB_CFG_PORT,

			   port->cap_phy + LANE_ADP_CS_0, 1);

	if (ret)

		return ret;

		return false;



	widths = (phy & LANE_ADP_CS_0_SUPPORTED_WIDTH_MASK) >>

		LANE_ADP_CS_0_SUPPORTED_WIDTH_SHIFT;

drivers/usb/chipidea/udc.c

+4 −3
Original line number Diff line number Diff line
@@ -1530,18 +1530,19 @@ static const struct usb_ep_ops usb_ep_ops = { 
static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active)

{

	struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);

	unsigned long flags;



	if (is_active) {

		pm_runtime_get_sync(&_gadget->dev);

		hw_device_reset(ci);

		spin_lock_irqsave(&ci->lock, flags);

		spin_lock_irq(&ci->lock);

		if (ci->driver) {

			hw_device_state(ci, ci->ep0out->qh.dma);

			usb_gadget_set_state(_gadget, USB_STATE_POWERED);

			spin_unlock_irq(&ci->lock);

			usb_udc_vbus_handler(_gadget, true);

		} else {

			spin_unlock_irq(&ci->lock);

		}

		spin_unlock_irqrestore(&ci->lock, flags);

	} else {

		usb_udc_vbus_handler(_gadget, false);

		if (ci->driver)

drivers/usb/class/cdc-acm.c

+21 −13
Original line number Diff line number Diff line
@@ -896,10 +896,10 @@ static int get_serial_info(struct tty_struct *tty, struct serial_struct *ss) 


	ss->xmit_fifo_size = acm->writesize;

	ss->baud_base = le32_to_cpu(acm->line.dwDTERate);

	ss->close_delay	= acm->port.close_delay / 10;

	ss->close_delay	= jiffies_to_msecs(acm->port.close_delay) / 10;

	ss->closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?

				ASYNC_CLOSING_WAIT_NONE :

				acm->port.closing_wait / 10;

				jiffies_to_msecs(acm->port.closing_wait) / 10;

	return 0;

}
@@ -907,24 +907,32 @@ static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss) 
{

	struct acm *acm = tty->driver_data;

	unsigned int closing_wait, close_delay;

	unsigned int old_closing_wait, old_close_delay;

	int retval = 0;



	close_delay = ss->close_delay * 10;

	close_delay = msecs_to_jiffies(ss->close_delay * 10);

	closing_wait = ss->closing_wait == ASYNC_CLOSING_WAIT_NONE ?

			ASYNC_CLOSING_WAIT_NONE : ss->closing_wait * 10;

			ASYNC_CLOSING_WAIT_NONE :

			msecs_to_jiffies(ss->closing_wait * 10);



	/* we must redo the rounding here, so that the values match */

	old_close_delay	= jiffies_to_msecs(acm->port.close_delay) / 10;

	old_closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?

				ASYNC_CLOSING_WAIT_NONE :

				jiffies_to_msecs(acm->port.closing_wait) / 10;



	mutex_lock(&acm->port.mutex);



	if (!capable(CAP_SYS_ADMIN)) {

		if ((close_delay != acm->port.close_delay) ||

		    (closing_wait != acm->port.closing_wait))

	if ((ss->close_delay != old_close_delay) ||

            (ss->closing_wait != old_closing_wait)) {

		if (!capable(CAP_SYS_ADMIN))

			retval = -EPERM;

		else

			retval = -EOPNOTSUPP;

	} else {

		else {

			acm->port.close_delay  = close_delay;

			acm->port.closing_wait = closing_wait;

		}

	} else

		retval = -EOPNOTSUPP;



	mutex_unlock(&acm->port.mutex);

	return retval;

drivers/usb/core/quirks.c

+6 −0
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x0b05, 0x17e0), .driver_info =

			USB_QUIRK_IGNORE_REMOTE_WAKEUP },



	/* Realtek hub in Dell WD19 (Type-C) */

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



	/* Generic RTL8153 based ethernet adapters */

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



	/* Action Semiconductor flash disk */

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

			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/host/xhci-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		xhci->quirks |= XHCI_AMD_PLL_FIX;



	if (pdev->vendor == PCI_VENDOR_ID_AMD &&

		(pdev->device == 0x15e0 ||

		(pdev->device == 0x145c ||

		 pdev->device == 0x15e0 ||

		 pdev->device == 0x15e1 ||

		 pdev->device == 0x43bb))

		xhci->quirks |= XHCI_SUSPEND_DELAY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE