Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83280e90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a bunch of USB fixes for 4.10-rc3. Yeah, it's a lot, an
  artifact of the holiday break I think.

  Lots of gadget and the usual XHCI fixups for reported issues (one day
  that driver will calm down...) Also included are a bunch of usb-serial
  driver fixes, and for good measure, a number of much-reported MUSB
  driver issues have finally been resolved.

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

* tag 'usb-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (72 commits)
  USB: fix problems with duplicate endpoint addresses
  usb: ohci-at91: use descriptor-based gpio APIs correctly
  usb: storage: unusual_uas: Add JMicron JMS56x to unusual device
  usb: hub: Move hub_port_disable() to fix warning if PM is disabled
  usb: musb: blackfin: add bfin_fifo_offset in bfin_ops
  usb: musb: fix compilation warning on unused function
  usb: musb: Fix trying to free already-free IRQ 4
  usb: musb: dsps: implement clear_ep_rxintr() callback
  usb: musb: core: add clear_ep_rxintr() to musb_platform_ops
  USB: serial: ti_usb_3410_5052: fix NULL-deref at open
  USB: serial: spcp8x5: fix NULL-deref at open
  USB: serial: quatech2: fix sleep-while-atomic in close
  USB: serial: pl2303: fix NULL-deref at open
  USB: serial: oti6858: fix NULL-deref at open
  USB: serial: omninet: fix NULL-derefs at open and disconnect
  USB: serial: mos7840: fix misleading interrupt-URB comment
  USB: serial: mos7840: remove unused write URB
  USB: serial: mos7840: fix NULL-deref at open
  USB: serial: mos7720: remove obsolete port initialisation
  USB: serial: mos7720: fix parallel probe
  ...
parents cc250e26 0a8fd134

drivers/usb/core/config.c

+10 −0
Original line number Diff line number Diff line
@@ -239,6 +239,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, 
	if (ifp->desc.bNumEndpoints >= num_ep)

		goto skip_to_next_endpoint_or_interface_descriptor;



	/* Check for duplicate endpoint addresses */

	for (i = 0; i < ifp->desc.bNumEndpoints; ++i) {

		if (ifp->endpoint[i].desc.bEndpointAddress ==

		    d->bEndpointAddress) {

			dev_warn(ddev, "config %d interface %d altsetting %d has a duplicate 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;

drivers/usb/core/hub.c

+29 −30
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem); 


static void hub_release(struct kref *kref);

static int usb_reset_and_verify_device(struct usb_device *udev);

static void hub_usb3_port_prepare_disable(struct usb_hub *hub,

					  struct usb_port *port_dev);

static int hub_port_disable(struct usb_hub *hub, int port1, int set_state);



static inline char *portspeed(struct usb_hub *hub, int portstatus)

{
@@ -902,34 +901,6 @@ static int hub_set_port_link_state(struct usb_hub *hub, int port1, 
			USB_PORT_FEAT_LINK_STATE);

}



/*

 * USB-3 does not have a similar link state as USB-2 that will avoid negotiating

 * a connection with a plugged-in cable but will signal the host when the cable

 * is unplugged. Disable remote wake and set link state to U3 for USB-3 devices

 */

static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)

{

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

	struct usb_device *hdev = hub->hdev;

	int ret = 0;



	if (!hub->error) {

		if (hub_is_superspeed(hub->hdev)) {

			hub_usb3_port_prepare_disable(hub, port_dev);

			ret = hub_set_port_link_state(hub, port_dev->portnum,

						      USB_SS_PORT_LS_U3);

		} else {

			ret = usb_clear_port_feature(hdev, port1,

					USB_PORT_FEAT_ENABLE);

		}

	}

	if (port_dev->child && set_state)

		usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);

	if (ret && ret != -ENODEV)

		dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret);

	return ret;

}



/*

 * Disable a port and mark a logical connect-change event, so that some

 * time later hub_wq will disconnect() any existing usb_device on the port
@@ -4162,6 +4133,34 @@ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port, 


#endif	/* CONFIG_PM */



/*

 * USB-3 does not have a similar link state as USB-2 that will avoid negotiating

 * a connection with a plugged-in cable but will signal the host when the cable

 * is unplugged. Disable remote wake and set link state to U3 for USB-3 devices

 */

static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)

{

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

	struct usb_device *hdev = hub->hdev;

	int ret = 0;



	if (!hub->error) {

		if (hub_is_superspeed(hub->hdev)) {

			hub_usb3_port_prepare_disable(hub, port_dev);

			ret = hub_set_port_link_state(hub, port_dev->portnum,

						      USB_SS_PORT_LS_U3);

		} else {

			ret = usb_clear_port_feature(hdev, port1,

					USB_PORT_FEAT_ENABLE);

		}

	}

	if (port_dev->child && set_state)

		usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);

	if (ret && ret != -ENODEV)

		dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret);

	return ret;

}





/* USB 2.0 spec, 7.1.7.3 / fig 7-29:

 *

drivers/usb/dwc2/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -3753,7 +3753,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep, 
		hs_ep->desc_list = dma_alloc_coherent(hsotg->dev,

			MAX_DMA_DESC_NUM_GENERIC *

			sizeof(struct dwc2_dma_desc),

			&hs_ep->desc_list_dma, GFP_KERNEL);

			&hs_ep->desc_list_dma, GFP_ATOMIC);

		if (!hs_ep->desc_list) {

			ret = -ENOMEM;

			goto error2;

drivers/usb/dwc2/params.c

+9 −21
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ MODULE_DEVICE_TABLE(of, dwc2_of_match_table); 
static void dwc2_get_device_property(struct dwc2_hsotg *hsotg,

				     char *property, u8 size, u64 *value)

{

	u8 val8;

	u16 val16;

	u32 val32;



	switch (size) {
@@ -256,17 +254,7 @@ static void dwc2_get_device_property(struct dwc2_hsotg *hsotg, 
		*value = device_property_read_bool(hsotg->dev, property);

		break;

	case 1:

		if (device_property_read_u8(hsotg->dev, property, &val8))

			return;



		*value = val8;

		break;

	case 2:

		if (device_property_read_u16(hsotg->dev, property, &val16))

			return;



		*value = val16;

		break;

	case 4:

		if (device_property_read_u32(hsotg->dev, property, &val32))

			return;
@@ -1100,13 +1088,13 @@ static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg) 
	/* Buffer DMA */

	dwc2_set_param_bool(hsotg, &p->g_dma,

			    false, "gadget-dma",

			    true, false,

			    dma_capable, false,

			    dma_capable);



	/* DMA Descriptor */

	dwc2_set_param_bool(hsotg, &p->g_dma_desc, false,

			    "gadget-dma-desc",

			    p->g_dma, false,

			    !!hw->dma_desc_enable, false,

			    !!hw->dma_desc_enable);

}
@@ -1130,8 +1118,14 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg, 


		dwc2_set_param_bool(hsotg, &p->host_dma,

				    false, "host-dma",

				    true, false,

				    dma_capable, false,

				    dma_capable);

		dwc2_set_param_host_rx_fifo_size(hsotg,

				params->host_rx_fifo_size);

		dwc2_set_param_host_nperio_tx_fifo_size(hsotg,

				params->host_nperio_tx_fifo_size);

		dwc2_set_param_host_perio_tx_fifo_size(hsotg,

				params->host_perio_tx_fifo_size);

	}

	dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);

	dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
@@ -1140,12 +1134,6 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg, 
			params->host_support_fs_ls_low_power);

	dwc2_set_param_enable_dynamic_fifo(hsotg,

			params->enable_dynamic_fifo);

	dwc2_set_param_host_rx_fifo_size(hsotg,

			params->host_rx_fifo_size);

	dwc2_set_param_host_nperio_tx_fifo_size(hsotg,

			params->host_nperio_tx_fifo_size);

	dwc2_set_param_host_perio_tx_fifo_size(hsotg,

			params->host_perio_tx_fifo_size);

	dwc2_set_param_max_transfer_size(hsotg,

			params->max_transfer_size);

	dwc2_set_param_max_packet_count(hsotg,

drivers/usb/dwc3/core.h

+3 −7
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ 
#define DWC3_XHCI_RESOURCES_NUM	2



#define DWC3_SCRATCHBUF_SIZE	4096	/* each buffer is assumed to be 4KiB */

#define DWC3_EVENT_SIZE		4	/* bytes */

#define DWC3_EVENT_MAX_NUM	64	/* 2 events/endpoint */

#define DWC3_EVENT_BUFFERS_SIZE	(DWC3_EVENT_SIZE * DWC3_EVENT_MAX_NUM)

#define DWC3_EVENT_BUFFERS_SIZE	4096

#define DWC3_EVENT_TYPE_MASK	0xfe



#define DWC3_EVENT_TYPE_DEV	0
@@ -311,9 +309,8 @@ 
#define DWC3_DCFG_SUPERSPEED_PLUS (5 << 0)  /* DWC_usb31 only */

#define DWC3_DCFG_SUPERSPEED	(4 << 0)

#define DWC3_DCFG_HIGHSPEED	(0 << 0)

#define DWC3_DCFG_FULLSPEED2	(1 << 0)

#define DWC3_DCFG_FULLSPEED	(1 << 0)

#define DWC3_DCFG_LOWSPEED	(2 << 0)

#define DWC3_DCFG_FULLSPEED1	(3 << 0)



#define DWC3_DCFG_NUMP_SHIFT	17

#define DWC3_DCFG_NUMP(n)	(((n) >> DWC3_DCFG_NUMP_SHIFT) & 0x1f)
@@ -405,9 +402,8 @@ 
#define DWC3_DSTS_SUPERSPEED_PLUS	(5 << 0) /* DWC_usb31 only */

#define DWC3_DSTS_SUPERSPEED		(4 << 0)

#define DWC3_DSTS_HIGHSPEED		(0 << 0)

#define DWC3_DSTS_FULLSPEED2		(1 << 0)

#define DWC3_DSTS_FULLSPEED		(1 << 0)

#define DWC3_DSTS_LOWSPEED		(2 << 0)

#define DWC3_DSTS_FULLSPEED1		(3 << 0)



/* Device Generic Command Register */

#define DWC3_DGCMD_SET_LMP		0x01