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

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

Merge tag 'fixes-for-v4.18-rc5' of... 

Merge tag 'fixes-for-v4.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v4.18-rc5

With a total of 20 non-merge commits, we have accumulated quite a few
fixes. These include lot's of fixes the our audio gadget interface, a
build error fix for PPC64 builds for the frescale PHY driver,
sleep-while-atomic fixes on the r8a66597 UDC driver, 3-stage SETUP fix
for the aspeed-vhub UDC and some other misc fixes.
parents 24dd9ba1 eec24f2a

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

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of 
the node is not important. The content of the node is defined in dwc3.txt.



Phy documentation is provided in the following places:

Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt     - Type-C PHY



Example device nodes:

drivers/usb/dwc2/gadget.c

+3 −3
Original line number Diff line number Diff line
@@ -3430,7 +3430,7 @@ static void dwc2_gadget_handle_incomplete_isoc_in(struct dwc2_hsotg *hsotg) 
	for (idx = 1; idx < hsotg->num_of_eps; idx++) {

		hs_ep = hsotg->eps_in[idx];

		/* Proceed only unmasked ISOC EPs */

		if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

		if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

			continue;



		epctrl = dwc2_readl(hsotg->regs + DIEPCTL(idx));
@@ -3476,7 +3476,7 @@ static void dwc2_gadget_handle_incomplete_isoc_out(struct dwc2_hsotg *hsotg) 
	for (idx = 1; idx < hsotg->num_of_eps; idx++) {

		hs_ep = hsotg->eps_out[idx];

		/* Proceed only unmasked ISOC EPs */

		if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

		if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

			continue;



		epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
@@ -3650,7 +3650,7 @@ static irqreturn_t dwc2_hsotg_irq(int irq, void *pw) 
		for (idx = 1; idx < hsotg->num_of_eps; idx++) {

			hs_ep = hsotg->eps_out[idx];

			/* Proceed only unmasked ISOC EPs */

			if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

			if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

				continue;



			epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));

drivers/usb/dwc2/hcd.c

+31 −23
Original line number Diff line number Diff line
@@ -2665,34 +2665,35 @@ static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg, 


#define DWC2_USB_DMA_ALIGN 4



struct dma_aligned_buffer {

	void *kmalloc_ptr;

	void *old_xfer_buffer;

	u8 data[0];

};



static void dwc2_free_dma_aligned_buffer(struct urb *urb)

{

	struct dma_aligned_buffer *temp;

	void *stored_xfer_buffer;

	size_t length;



	if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))

		return;



	temp = container_of(urb->transfer_buffer,

			    struct dma_aligned_buffer, data);

	/* Restore urb->transfer_buffer from the end of the allocated area */

	memcpy(&stored_xfer_buffer, urb->transfer_buffer +

	       urb->transfer_buffer_length, sizeof(urb->transfer_buffer));



	if (usb_urb_dir_in(urb))

		memcpy(temp->old_xfer_buffer, temp->data,

		       urb->transfer_buffer_length);

	urb->transfer_buffer = temp->old_xfer_buffer;

	kfree(temp->kmalloc_ptr);

	if (usb_urb_dir_in(urb)) {

		if (usb_pipeisoc(urb->pipe))

			length = urb->transfer_buffer_length;

		else

			length = urb->actual_length;



		memcpy(stored_xfer_buffer, urb->transfer_buffer, length);

	}

	kfree(urb->transfer_buffer);

	urb->transfer_buffer = stored_xfer_buffer;



	urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;

}



static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)

{

	struct dma_aligned_buffer *temp, *kmalloc_ptr;

	void *kmalloc_ptr;

	size_t kmalloc_size;



	if (urb->num_sgs || urb->sg ||
@@ -2700,22 +2701,29 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags) 
	    !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1)))

		return 0;



	/* Allocate a buffer with enough padding for alignment */

	/*

	 * Allocate a buffer with enough padding for original transfer_buffer

	 * pointer. This allocation is guaranteed to be aligned properly for

	 * DMA

	 */

	kmalloc_size = urb->transfer_buffer_length +

		sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1;

		sizeof(urb->transfer_buffer);



	kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);

	if (!kmalloc_ptr)

		return -ENOMEM;



	/* Position our struct dma_aligned_buffer such that data is aligned */

	temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1;

	temp->kmalloc_ptr = kmalloc_ptr;

	temp->old_xfer_buffer = urb->transfer_buffer;

	/*

	 * Position value of original urb->transfer_buffer pointer to the end

	 * of allocation for later referencing

	 */

	memcpy(kmalloc_ptr + urb->transfer_buffer_length,

	       &urb->transfer_buffer, sizeof(urb->transfer_buffer));



	if (usb_urb_dir_out(urb))

		memcpy(temp->data, urb->transfer_buffer,

		memcpy(kmalloc_ptr, urb->transfer_buffer,

		       urb->transfer_buffer_length);

	urb->transfer_buffer = temp->data;

	urb->transfer_buffer = kmalloc_ptr;



	urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER;

drivers/usb/dwc2/hcd_intr.c

+7 −2
Original line number Diff line number Diff line
@@ -1231,7 +1231,10 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg, 
	 * avoid interrupt storms we'll wait before retrying if we've got

	 * several NAKs. If we didn't do this we'd retry directly from the

	 * interrupt handler and could end up quickly getting another

	 * interrupt (another NAK), which we'd retry.

	 * interrupt (another NAK), which we'd retry. Note that we do not

	 * delay retries for IN parts of control requests, as those are expected

	 * to complete fairly quickly, and if we delay them we risk confusing

	 * the device and cause it issue STALL.

	 *

	 * Note that in DMA mode software only gets involved to re-send NAKed

	 * transfers for split transactions, so we only need to apply this
@@ -1244,7 +1247,9 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg, 
			qtd->error_count = 0;

		qtd->complete_split = 0;

		qtd->num_naks++;

		qtd->qh->want_wait = qtd->num_naks >= DWC2_NAKS_BEFORE_DELAY;

		qtd->qh->want_wait = qtd->num_naks >= DWC2_NAKS_BEFORE_DELAY &&

				!(chan->ep_type == USB_ENDPOINT_XFER_CONTROL &&

				  chan->ep_is_in);

		dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_NAK);

		goto handle_nak_done;

	}

drivers/usb/dwc3/ep0.c

+0 −3
Original line number Diff line number Diff line
@@ -973,15 +973,12 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, 
		ret = dwc3_ep0_start_trans(dep);

	} else if (IS_ALIGNED(req->request.length, dep->endpoint.maxpacket) &&

		   req->request.length && req->request.zero) {

		u32	maxpacket;



		ret = usb_gadget_map_request_by_dev(dwc->sysdev,

				&req->request, dep->number);

		if (ret)

			return;



		maxpacket = dep->endpoint.maxpacket;



		/* prepare normal TRB */

		dwc3_ep0_prepare_one_trb(dep, req->request.dma,

					 req->request.length,