Commit 523d0b1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / Thunderbolt fixes from Greg KH:
 "Here are a number of tiny USB and Thunderbolt driver fixes for
  5.13-rc4.

  They consist of:

   - thunderbolt fixes for some NVM bound issues

   - xhci fixes for reported problems

   - control-request fixups

   - documentation build warning fixes

   - new usb-serial driver device ids

   - typec bugfixes for reported issues

   - usbfs warning fixups (could be triggered from userspace)

   - other tiny fixes for reported problems.

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

* tag 'usb-5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
  xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall
  xhci: fix giving back URB with incorrect status regression in 5.12
  usb: gadget: udc: renesas_usb3: Fix a race in usb3_start_pipen()
  usb: typec: tcpm: Respond Not_Supported if no snk_vdo
  usb: typec: tcpm: Properly interrupt VDM AMS
  USB: trancevibrator: fix control-request direction
  usb: Restore the usb_header label
  usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
  usb: typec: ucsi: Clear pending after acking connector change
  usb: typec: mux: Fix matching with typec_altmode_desc
  misc/uss720: fix memory leak in uss720_probe
  usb: dwc3: gadget: Properly track pending and queued SG
  USB: usbfs: Don't WARN about excessively large memory allocations
  thunderbolt: usb4: Fix NVM read buffer bounds and offset issue
  thunderbolt: dma_port: Fix NVM read buffer bounds and offset issue
  usb: chipidea: udc: assign interrupt number to USB gadget structure
  usb: cdnsp: Fix lack of removing request from pending list.
  usb: cdns3: Fix runtime PM imbalance on error
  USB: serial: pl2303: add device id for ADLINK ND-6530 GC
  USB: serial: ti_usb_3410_5052: add startech.com device id
  ...
parents 22447828 a7f2e927

Documentation/driver-api/usb/usb.rst

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ are in ``drivers/usb/common/common.c``. 
In addition, some functions useful for creating debugging output are

defined in ``drivers/usb/common/debug.c``.



.. _usb_header:



Host-Side Data Types and Macros

===============================

drivers/thunderbolt/dma_port.c

+6 −5
Original line number Diff line number Diff line
@@ -366,15 +366,15 @@ int dma_port_flash_read(struct tb_dma_port *dma, unsigned int address, 
			void *buf, size_t size)

{

	unsigned int retries = DMA_PORT_RETRIES;

	unsigned int offset;



	offset = address & 3;

	address = address & ~3;



	do {

		u32 nbytes = min_t(u32, size, MAIL_DATA_DWORDS * 4);

		unsigned int offset;

		size_t nbytes;

		int ret;



		offset = address & 3;

		nbytes = min_t(size_t, size + offset, MAIL_DATA_DWORDS * 4);



		ret = dma_port_flash_read_block(dma, address, dma->buf,

						ALIGN(nbytes, 4));

		if (ret) {
@@ -386,6 +386,7 @@ int dma_port_flash_read(struct tb_dma_port *dma, unsigned int address, 
			return ret;

		}



		nbytes -= offset;

		memcpy(buf, dma->buf + offset, nbytes);



		size -= nbytes;

drivers/thunderbolt/usb4.c

+5 −4
Original line number Diff line number Diff line
@@ -68,15 +68,15 @@ static int usb4_do_read_data(u16 address, void *buf, size_t size, 
	unsigned int retries = USB4_DATA_RETRIES;

	unsigned int offset;



	offset = address & 3;

	address = address & ~3;



	do {

		size_t nbytes = min_t(size_t, size, USB4_DATA_DWORDS * 4);

		unsigned int dwaddress, dwords;

		u8 data[USB4_DATA_DWORDS * 4];

		size_t nbytes;

		int ret;



		offset = address & 3;

		nbytes = min_t(size_t, size + offset, USB4_DATA_DWORDS * 4);



		dwaddress = address / 4;

		dwords = ALIGN(nbytes, 4) / 4;
@@ -87,6 +87,7 @@ static int usb4_do_read_data(u16 address, void *buf, size_t size, 
			return ret;

		}



		nbytes -= offset;

		memcpy(buf, data + offset, nbytes);



		size -= nbytes;

drivers/usb/cdns3/cdns3-gadget.c

+3 −1
Original line number Diff line number Diff line
@@ -3268,8 +3268,10 @@ static int __cdns3_gadget_init(struct cdns *cdns) 
	pm_runtime_get_sync(cdns->dev);



	ret = cdns3_gadget_start(cdns);

	if (ret)

	if (ret) {

		pm_runtime_put_sync(cdns->dev);

		return ret;

	}



	/*

	 * Because interrupt line can be shared with other components in

drivers/usb/cdns3/cdnsp-gadget.c

+7 −7
Original line number Diff line number Diff line
@@ -422,17 +422,17 @@ int cdnsp_ep_enqueue(struct cdnsp_ep *pep, struct cdnsp_request *preq) 
int cdnsp_ep_dequeue(struct cdnsp_ep *pep, struct cdnsp_request *preq)

{

	struct cdnsp_device *pdev = pep->pdev;

	int ret;

	int ret_stop = 0;

	int ret_rem;



	trace_cdnsp_request_dequeue(preq);



	if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {

		ret = cdnsp_cmd_stop_ep(pdev, pep);

		if (ret)

			return ret;

	}

	if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)

		ret_stop = cdnsp_cmd_stop_ep(pdev, pep);



	ret_rem = cdnsp_remove_request(pdev, preq, pep);



	return cdnsp_remove_request(pdev, preq, pep);

	return ret_rem ? ret_rem : ret_stop;

}



static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)