Commit dc8b2a69 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 

Felipe writes:

USB: changes for v5.1 merge window

Dwc3 now works on TI's AM6xx platforms. Also on dwc3 we have a few
changes which improve request cancellation and some improvements to
how we print to the trace buffer.

Renesas_usb3 got support for r8a774c0 device.

Dwc2 got scatter-gather support.

Apart from these, the usual set of minor fixes and all sorts of small
details.

* tag 'usb-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (40 commits)
  usb: phy: twl6030-usb: fix possible use-after-free on remove
  usb: misc: usbtest: add super-speed isoc support
  usb: dwc3: Reset num_trbs after skipping
  usb: dwc3: gadget: don't enable interrupt when disabling endpoint
  fotg210-udc: pass struct device to DMA API functions
  fotg210-udc: remove a bogus dma_sync_single_for_device call
  usb: gadget: Change Andrzej Pietrasiewicz's e-mail address
  usb: f_fs: Avoid crash due to out-of-scope stack ptr access
  usb: dwc3: haps: Workaround matching VID PID
  usb: gadget: f_fs: preserve wMaxPacketSize across usb_ep_autoconfig() call
  usb: gadget: move non-super speed code out of usb_ep_autoconfig_ss()
  usb: gadget: function: sync f_uac1 ac header baInterfaceNr
  usb: dwc2: gadget: Add scatter-gather mode
  usb: gadget: fix various indentation issues
  usb: dwc2: Fix EP TxFIFO number setting
  udc: net2280: Fix net2280_disable
  USB: gadget: Improve kerneldoc for usb_ep_dequeue()
  usb: dwc3: debug: purge usage of strcat
  usb: dwc3: trace: pass trace buffer size to decoding functions
  usb: dwc3: gadget: remove DWC3_EP_END_TRANSFER_PENDING
  ...
parents 09aa11cf 5895d311

Documentation/devicetree/bindings/usb/keystone-usb.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ TI Keystone Soc USB Controller 
DWC3 GLUE



Required properties:

 - compatible: should be "ti,keystone-dwc3".

 - compatible: should be

		"ti,keystone-dwc3" for Keystone 2 SoCs

		"ti,am654-dwc3" for AM654 SoC

 - #address-cells, #size-cells : should be '1' if the device has sub-nodes

   with 'reg' property.

 - reg : Address and length of the register set for the USB subsystem on
@@ -21,7 +23,7 @@ SoCs only: 
- clock-names:		Must be "usb".





The following are mandatory properties for Keystone 2 66AK2G SoCs only:

The following are mandatory properties for 66AK2G and AM654:



- power-domains:	Should contain a phandle to a PM domain provider node

			and an args specifier containing the USB device id

Documentation/devicetree/bindings/usb/qcom,dwc3.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible:		Compatible list, contains

			"qcom,dwc3"

			"qcom,msm8996-dwc3" for msm8996 SOC.

			"qcom,msm8998-dwc3" for msm8998 SOC.

			"qcom,sdm845-dwc3" for sdm845 SOC.

- reg:			Offset and length of register set for QSCRATCH wrapper

- power-domains:	specifies a phandle to PM domain provider node

Documentation/devicetree/bindings/usb/renesas_usb3.txt

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Renesas Electronics USB3.0 Peripheral driver 
Required properties:

  - compatible: Must contain one of the following:

	- "renesas,r8a774a1-usb3-peri"

	- "renesas,r8a774c0-usb3-peri"

	- "renesas,r8a7795-usb3-peri"

	- "renesas,r8a7796-usb3-peri"

	- "renesas,r8a77965-usb3-peri"

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	- "renesas,usbhs-r8a7744" for r8a7744 (RZ/G1N) compatible device

	- "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device

	- "renesas,usbhs-r8a774a1" for r8a774a1 (RZ/G2M) compatible device

	- "renesas,usbhs-r8a774c0" for r8a774c0 (RZ/G2E) compatible device

	- "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device

	- "renesas,usbhs-r8a7791" for r8a7791 (R-Car M2-W) compatible device

	- "renesas,usbhs-r8a7792" for r8a7792 (R-Car V2H) compatible device

drivers/usb/dwc2/gadget.c

+78 −36
Original line number Diff line number Diff line
@@ -768,22 +768,13 @@ static u32 dwc2_gadget_get_desc_params(struct dwc2_hsotg_ep *hs_ep, u32 *mask) 
	return desc_size;

}



/*

 * dwc2_gadget_config_nonisoc_xfer_ddma - prepare non ISOC DMA desc chain.

 * @hs_ep: The endpoint

 * @dma_buff: DMA address to use

 * @len: Length of the transfer

 *

 * This function will iterate over descriptor chain and fill its entries

 * with corresponding information based on transfer data.

 */

static void dwc2_gadget_config_nonisoc_xfer_ddma(struct dwc2_hsotg_ep *hs_ep,

static void dwc2_gadget_fill_nonisoc_xfer_ddma_one(struct dwc2_hsotg_ep *hs_ep,

						 struct dwc2_dma_desc **desc,

						 dma_addr_t dma_buff,

						 unsigned int len)

						 unsigned int len,

						 bool true_last)

{

	struct dwc2_hsotg *hsotg = hs_ep->parent;

	int dir_in = hs_ep->dir_in;

	struct dwc2_dma_desc *desc = hs_ep->desc_list;

	u32 mps = hs_ep->ep.maxpacket;

	u32 maxsize = 0;

	u32 offset = 0;
@@ -798,41 +789,79 @@ static void dwc2_gadget_config_nonisoc_xfer_ddma(struct dwc2_hsotg_ep *hs_ep, 
		hs_ep->desc_count = 1;



	for (i = 0; i < hs_ep->desc_count; ++i) {

		desc->status = 0;

		desc->status |= (DEV_DMA_BUFF_STS_HBUSY

		(*desc)->status = 0;

		(*desc)->status |= (DEV_DMA_BUFF_STS_HBUSY

				 << DEV_DMA_BUFF_STS_SHIFT);



		if (len > maxsize) {

			if (!hs_ep->index && !dir_in)

				desc->status |= (DEV_DMA_L | DEV_DMA_IOC);

				(*desc)->status |= (DEV_DMA_L | DEV_DMA_IOC);



			desc->status |= (maxsize <<

						DEV_DMA_NBYTES_SHIFT & mask);

			desc->buf = dma_buff + offset;

			(*desc)->status |=

				maxsize << DEV_DMA_NBYTES_SHIFT & mask;

			(*desc)->buf = dma_buff + offset;



			len -= maxsize;

			offset += maxsize;

		} else {

			desc->status |= (DEV_DMA_L | DEV_DMA_IOC);

			if (true_last)

				(*desc)->status |= (DEV_DMA_L | DEV_DMA_IOC);



			if (dir_in)

				desc->status |= (len % mps) ? DEV_DMA_SHORT :

					((hs_ep->send_zlp) ? DEV_DMA_SHORT : 0);

			if (len > maxsize)

				dev_err(hsotg->dev, "wrong len %d\n", len);

				(*desc)->status |= (len % mps) ? DEV_DMA_SHORT :

					((hs_ep->send_zlp && true_last) ?

					DEV_DMA_SHORT : 0);



			desc->status |=

			(*desc)->status |=

				len << DEV_DMA_NBYTES_SHIFT & mask;

			desc->buf = dma_buff + offset;

			(*desc)->buf = dma_buff + offset;

		}



		desc->status &= ~DEV_DMA_BUFF_STS_MASK;

		desc->status |= (DEV_DMA_BUFF_STS_HREADY

		(*desc)->status &= ~DEV_DMA_BUFF_STS_MASK;

		(*desc)->status |= (DEV_DMA_BUFF_STS_HREADY

				 << DEV_DMA_BUFF_STS_SHIFT);

		desc++;

		(*desc)++;

	}

}



/*

 * dwc2_gadget_config_nonisoc_xfer_ddma - prepare non ISOC DMA desc chain.

 * @hs_ep: The endpoint

 * @ureq: Request to transfer

 * @offset: offset in bytes

 * @len: Length of the transfer

 *

 * This function will iterate over descriptor chain and fill its entries

 * with corresponding information based on transfer data.

 */

static void dwc2_gadget_config_nonisoc_xfer_ddma(struct dwc2_hsotg_ep *hs_ep,

						 struct usb_request *ureq,

						 unsigned int offset,

						 unsigned int len)

{

	struct dwc2_dma_desc *desc = hs_ep->desc_list;

	struct scatterlist *sg;

	int i;

	u8 desc_count = 0;



	/* non-DMA sg buffer */

	if (!ureq->num_sgs) {

		dwc2_gadget_fill_nonisoc_xfer_ddma_one(hs_ep, &desc,

			ureq->dma + offset, len, true);

		return;

	}



	/* DMA sg buffer */

	for_each_sg(ureq->sg, sg, ureq->num_sgs, i) {

		dwc2_gadget_fill_nonisoc_xfer_ddma_one(hs_ep, &desc,

			sg_dma_address(sg) + sg->offset, sg_dma_len(sg),

			sg_is_last(sg));

		desc_count += hs_ep->desc_count;

	}



	hs_ep->desc_count = desc_count;

}



/*

 * dwc2_gadget_fill_isoc_desc - fills next isochronous descriptor in chain.

 * @hs_ep: The isochronous endpoint.
@@ -944,7 +973,13 @@ static void dwc2_gadget_start_isoc_ddma(struct dwc2_hsotg_ep *hs_ep) 


	hs_ep->next_desc = 0;

	list_for_each_entry_safe(hs_req, treq, &hs_ep->queue, queue) {

		ret = dwc2_gadget_fill_isoc_desc(hs_ep, hs_req->req.dma,

		dma_addr_t dma_addr = hs_req->req.dma;



		if (hs_req->req.num_sgs) {

			WARN_ON(hs_req->req.num_sgs > 1);

			dma_addr = sg_dma_address(hs_req->req.sg);

		}

		ret = dwc2_gadget_fill_isoc_desc(hs_ep, dma_addr,

						 hs_req->req.length);

		if (ret)

			break;
@@ -1100,7 +1135,7 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, 
			offset = ureq->actual;



		/* Fill DDMA chain entries */

		dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, ureq->dma + offset,

		dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, ureq, offset,

						     length);



		/* write descriptor chain address to control register */
@@ -1399,7 +1434,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, 
	 */

	if (using_desc_dma(hs) && hs_ep->isochronous) {

		if (hs_ep->target_frame != TARGET_FRAME_INITIAL) {

			dwc2_gadget_fill_isoc_desc(hs_ep, hs_req->req.dma,

			dma_addr_t dma_addr = hs_req->req.dma;



			if (hs_req->req.num_sgs) {

				WARN_ON(hs_req->req.num_sgs > 1);

				dma_addr = sg_dma_address(hs_req->req.sg);

			}

			dwc2_gadget_fill_isoc_desc(hs_ep, dma_addr,

						   hs_req->req.length);

		}

		return 0;
@@ -1987,13 +2028,12 @@ static void dwc2_hsotg_program_zlp(struct dwc2_hsotg *hsotg, 
		dev_dbg(hsotg->dev, "Receiving zero-length packet on ep%d\n",

			index);

	if (using_desc_dma(hsotg)) {

		/* Not specific buffer needed for ep0 ZLP */

		dma_addr_t dma = hs_ep->desc_list_dma;



		if (!index)

			dwc2_gadget_set_ep0_desc_chain(hsotg, hs_ep);



		dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, dma, 0);

		/* Not specific buffer needed for ep0 ZLP */

		dwc2_gadget_fill_nonisoc_xfer_ddma_one(hs_ep, &hs_ep->desc_list,

			hs_ep->desc_list_dma, 0, true);

	} else {

		dwc2_writel(hsotg, DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) |

			    DXEPTSIZ_XFERSIZE(0),
@@ -4005,6 +4045,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep, 
			ret = -ENOMEM;

			goto error1;

		}

		epctrl &= ~(DXEPCTL_TXFNUM_LIMIT << DXEPCTL_TXFNUM_SHIFT);

		hsotg->fifo_map |= 1 << fifo_index;

		epctrl |= DXEPCTL_TXFNUM(fifo_index);

		hs_ep->fifo_index = fifo_index;
@@ -4385,6 +4426,7 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, 
	hsotg->enabled = 0;

	spin_unlock_irqrestore(&hsotg->lock, flags);



	gadget->sg_supported = using_desc_dma(hsotg);

	dev_info(hsotg->dev, "bound driver %s\n", driver->driver.name);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE