Commit 9057a646 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB driver fixes from Greg KH:
 "Here are some small USB driver fixes and new device ids for 5.19-rc3

  They include:

   - new usb-serial driver device ids

   - usb gadget driver fixes for reported problems

   - cdnsp driver fix

   - dwc3 driver fixes for reported problems

   - dwc3 driver fix for merge problem that I caused in 5.18

   - xhci driver fixes

   - dwc2 memory leak fix

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

* tag 'usb-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: f_fs: change ep->ep safe in ffs_epfile_io()
  usb: gadget: f_fs: change ep->status safe in ffs_epfile_io()
  xhci: Fix null pointer dereference in resume if xhci has only one roothub
  USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
  usb: cdnsp: Fixed setting last_trb incorrectly
  usb: gadget: u_ether: fix regression in setting fixed MAC address
  usb: gadget: lpc32xx_udc: Fix refcount leak in lpc32xx_udc_probe
  usb: dwc2: Fix memory leak in dwc2_hcd_init
  usb: dwc3: pci: Restore line lost in merge conflict resolution
  usb: dwc3: gadget: Fix IN endpoint max packet size allocation
  USB: serial: option: add support for Cinterion MV31 with new baseline
  USB: serial: io_ti: add Agilent E5805A support
parents 47700948 0698f020

drivers/usb/cdns3/cdnsp-ring.c

+11 −8
Original line number Diff line number Diff line
@@ -1941,14 +1941,17 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq) 
		}



		if (enqd_len + trb_buff_len >= full_len) {

			if (need_zero_pkt)

				zero_len_trb = !zero_len_trb;



			if (need_zero_pkt && !zero_len_trb) {

				zero_len_trb = true;

			} else {

				zero_len_trb = false;

				field &= ~TRB_CHAIN;

				field |= TRB_IOC;

				more_trbs_coming = false;

				need_zero_pkt = false;

				preq->td.last_trb = ring->enqueue;

			}

		}



		/* Only set interrupt on short packet for OUT endpoints. */

		if (!preq->direction)
@@ -1962,7 +1965,7 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq) 
		length_field = TRB_LEN(trb_buff_len) | TRB_TD_SIZE(remainder) |

			TRB_INTR_TARGET(0);



		cdnsp_queue_trb(pdev, ring, more_trbs_coming | zero_len_trb,

		cdnsp_queue_trb(pdev, ring, more_trbs_coming,

				lower_32_bits(send_addr),

				upper_32_bits(send_addr),

				length_field,

drivers/usb/dwc2/hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -5190,7 +5190,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		retval = -EINVAL;

		goto error1;

		goto error2;

	}

	hcd->rsrc_start = res->start;

	hcd->rsrc_len = resource_size(res);

drivers/usb/dwc3/core.c

+2 −7
Original line number Diff line number Diff line
@@ -1644,13 +1644,8 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) 
	 * This device property is for kernel internal use only and

	 * is expected to be set by the glue code.

	 */

	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {

		edev = extcon_get_extcon_dev(name);

		if (!edev)

			return ERR_PTR(-EPROBE_DEFER);



		return edev;

	}

	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)

		return extcon_get_extcon_dev(name);



	/*

	 * Try to get an extcon device from the USB PHY controller's "port"

drivers/usb/dwc3/dwc3-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[ 
	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),

	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),

	PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),

	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

	{}

};

drivers/usb/dwc3/gadget.c

+15 −11
Original line number Diff line number Diff line
@@ -2976,6 +2976,7 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) 
	struct dwc3 *dwc = dep->dwc;

	u32 mdwidth;

	int size;

	int maxpacket;



	mdwidth = dwc3_mdwidth(dwc);
@@ -2988,21 +2989,24 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) 
	else

		size = DWC31_GTXFIFOSIZ_TXFDEP(size);



	/* FIFO Depth is in MDWDITH bytes. Multiply */

	size *= mdwidth;



	/*

	 * To meet performance requirement, a minimum TxFIFO size of 3x

	 * MaxPacketSize is recommended for endpoints that support burst and a

	 * minimum TxFIFO size of 2x MaxPacketSize for endpoints that don't

	 * support burst. Use those numbers and we can calculate the max packet

	 * limit as below.

	 * maxpacket size is determined as part of the following, after assuming

	 * a mult value of one maxpacket:

	 * DWC3 revision 280A and prior:

	 * fifo_size = mult * (max_packet / mdwidth) + 1;

	 * maxpacket = mdwidth * (fifo_size - 1);

	 *

	 * DWC3 revision 290A and onwards:

	 * fifo_size = mult * ((max_packet + mdwidth)/mdwidth + 1) + 1

	 * maxpacket = mdwidth * ((fifo_size - 1) - 1) - mdwidth;

	 */

	if (dwc->maximum_speed >= USB_SPEED_SUPER)

		size /= 3;

	if (DWC3_VER_IS_PRIOR(DWC3, 290A))

		maxpacket = mdwidth * (size - 1);

	else

		size /= 2;

		maxpacket = mdwidth * ((size - 1) - 1) - mdwidth;



	/* Functionally, space for one max packet is sufficient */

	size = min_t(int, maxpacket, 1024);

	usb_ep_set_maxpacket_limit(&dep->endpoint, size);



	dep->endpoint.max_streams = 16;