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

Merge tag 'usb-5.16-rc1' 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 reported problems for
  5.16-rc3

  They include:

   - typec driver fixes

   - new usb-serial driver ids

   - usb hub enumeration issues that were much reported

   - gadget driver fixes

   - dwc3 driver fix

   - chipidea driver fixe

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

* tag 'usb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: option: add Fibocom FM101-GL variants
  usb: typec: tipd: Fix initialization sequence for cd321x
  usb: typec: tipd: Fix typo in cd321x_switch_power_state
  usb: hub: Fix locking issues with address0_mutex
  USB: serial: pl2303: fix GC type detection
  USB: serial: option: add Telit LE910S1 0x9200 composition
  usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe
  usb: hub: Fix usb enumeration issue due to address0 race
  usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts
  usb: dwc3: leave default DMA for PCI devices
  usb: dwc2: hcd_queue: Fix use of floating point literal
  usb: dwc3: gadget: Fix null pointer exception
  usb: gadget: udc-xilinx: Fix an error handling path in 'xudc_probe()'
  usb: xhci: tegra: Check padctrl interrupt presence in device tree
  usb: dwc2: gadget: Fix ISOC flow for elapsed frames
  usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer
  usb: dwc3: gadget: Ignore NoStream after End Transfer
  usb: dwc3: core: Revise GHWPARAMS9 offset
parents d3e64792 a88db2ec

drivers/usb/chipidea/ci_hdrc_imx.c

+9 −9
Original line number Diff line number Diff line
@@ -420,7 +420,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0);

	if (IS_ERR(data->phy)) {

		ret = PTR_ERR(data->phy);

		if (ret == -ENODEV) {

		if (ret != -ENODEV)

			goto err_clk;

		data->phy = devm_usb_get_phy_by_phandle(dev, "phys", 0);

		if (IS_ERR(data->phy)) {

			ret = PTR_ERR(data->phy);
@@ -430,7 +431,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
				goto err_clk;

		}

	}

	}



	pdata.usb_phy = data->phy;

	if (data->usbmisc_data)

drivers/usb/core/hub.c

+18 −6
Original line number Diff line number Diff line
@@ -4700,8 +4700,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
	if (oldspeed == USB_SPEED_LOW)

		delay = HUB_LONG_RESET_TIME;



	mutex_lock(hcd->address0_mutex);



	/* Reset the device; full speed may morph to high speed */

	/* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */

	retval = hub_port_reset(hub, port1, udev, delay, false);
@@ -5016,7 +5014,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
		hub_port_disable(hub, port1, 0);

		update_devnum(udev, devnum);	/* for disconnect processing */

	}

	mutex_unlock(hcd->address0_mutex);

	return retval;

}
@@ -5191,6 +5188,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
	struct usb_port *port_dev = hub->ports[port1 - 1];

	struct usb_device *udev = port_dev->child;

	static int unreliable_port = -1;

	bool retry_locked;



	/* Disconnect any existing devices under this port */

	if (udev) {
@@ -5246,8 +5244,11 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		unit_load = 100;



	status = 0;

	for (i = 0; i < PORT_INIT_TRIES; i++) {



	for (i = 0; i < PORT_INIT_TRIES; i++) {

		usb_lock_port(port_dev);

		mutex_lock(hcd->address0_mutex);

		retry_locked = true;

		/* reallocate for each attempt, since references

		 * to the previous one can escape in various ways

		 */
@@ -5255,6 +5256,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		if (!udev) {

			dev_err(&port_dev->dev,

					"couldn't allocate usb_device\n");

			mutex_unlock(hcd->address0_mutex);

			usb_unlock_port(port_dev);

			goto done;

		}
@@ -5276,12 +5279,14 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		}



		/* reset (non-USB 3.0 devices) and get descriptor */

		usb_lock_port(port_dev);

		status = hub_port_init(hub, udev, port1, i);

		usb_unlock_port(port_dev);

		if (status < 0)

			goto loop;



		mutex_unlock(hcd->address0_mutex);

		usb_unlock_port(port_dev);

		retry_locked = false;



		if (udev->quirks & USB_QUIRK_DELAY_INIT)

			msleep(2000);
@@ -5374,6 +5379,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
		usb_ep0_reinit(udev);

		release_devnum(udev);

		hub_free_dev(udev);

		if (retry_locked) {

			mutex_unlock(hcd->address0_mutex);

			usb_unlock_port(port_dev);

		}

		usb_put_dev(udev);

		if ((status == -ENOTCONN) || (status == -ENOTSUPP))

			break;
@@ -5915,6 +5924,8 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	bos = udev->bos;

	udev->bos = NULL;



	mutex_lock(hcd->address0_mutex);



	for (i = 0; i < PORT_INIT_TRIES; ++i) {



		/* ep0 maxpacket size may change; let the HCD know about it.
@@ -5924,6 +5935,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
		if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV)

			break;

	}

	mutex_unlock(hcd->address0_mutex);



	if (ret < 0)

		goto re_enumerate;

drivers/usb/dwc2/gadget.c

+14 −3
Original line number Diff line number Diff line
@@ -1198,6 +1198,8 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, 
			}

			ctrl |= DXEPCTL_CNAK;

		} else {

			hs_req->req.frame_number = hs_ep->target_frame;

			hs_req->req.actual = 0;

			dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, -ENODATA);

			return;

		}
@@ -2857,9 +2859,12 @@ static void dwc2_gadget_handle_ep_disabled(struct dwc2_hsotg_ep *hs_ep) 


	do {

		hs_req = get_ep_head(hs_ep);

		if (hs_req)

		if (hs_req) {

			hs_req->req.frame_number = hs_ep->target_frame;

			hs_req->req.actual = 0;

			dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req,

						    -ENODATA);

		}

		dwc2_gadget_incr_frame_num(hs_ep);

		/* Update current frame number value. */

		hsotg->frame_number = dwc2_hsotg_read_frameno(hsotg);
@@ -2912,8 +2917,11 @@ static void dwc2_gadget_handle_out_token_ep_disabled(struct dwc2_hsotg_ep *ep) 


	while (dwc2_gadget_target_frame_elapsed(ep)) {

		hs_req = get_ep_head(ep);

		if (hs_req)

		if (hs_req) {

			hs_req->req.frame_number = ep->target_frame;

			hs_req->req.actual = 0;

			dwc2_hsotg_complete_request(hsotg, ep, hs_req, -ENODATA);

		}



		dwc2_gadget_incr_frame_num(ep);

		/* Update current frame number value. */
@@ -3002,8 +3010,11 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep) 


	while (dwc2_gadget_target_frame_elapsed(hs_ep)) {

		hs_req = get_ep_head(hs_ep);

		if (hs_req)

		if (hs_req) {

			hs_req->req.frame_number = hs_ep->target_frame;

			hs_req->req.actual = 0;

			dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, -ENODATA);

		}



		dwc2_gadget_incr_frame_num(hs_ep);

		/* Update current frame number value. */

drivers/usb/dwc2/hcd_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#define DWC2_UNRESERVE_DELAY (msecs_to_jiffies(5))



/* If we get a NAK, wait this long before retrying */

#define DWC2_RETRY_WAIT_DELAY (1 * 1E6L)

#define DWC2_RETRY_WAIT_DELAY (1 * NSEC_PER_MSEC)



/**

 * dwc2_periodic_channel_available() - Checks that a channel is available for a

drivers/usb/dwc3/core.c

+5 −3
Original line number Diff line number Diff line
@@ -1594,9 +1594,11 @@ static int dwc3_probe(struct platform_device *pdev) 


	dwc3_get_properties(dwc);



	if (!dwc->sysdev_is_parent) {

		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));

		if (ret)

			return ret;

	}



	dwc->reset = devm_reset_control_array_get_optional_shared(dev);

	if (IS_ERR(dwc->reset))