Commit 00a159a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Grek KH:
 "Here are some small USB fixes for 5.0-rc6.

  Nothing huge, the normal amount of USB gadget fixes as well as some
  USB phy fixes. There's also a typec fix as well. Full details are in
  the shortlog.

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

* tag 'usb-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: typec: tcpm: Correct the PPS out_volt calculation
  usb: gadget: musb: fix short isoc packets with inventra dma
  usb: phy: am335x: fix race condition in _probe
  usb: dwc3: exynos: Fix error handling of clk_prepare_enable
  usb: phy: fix link errors
  usb: gadget: udc: net2272: Fix bitwise and boolean operations
  usb: dwc3: gadget: Handle 0 xfer length for OUT EP
parents bd5ff862 a07ddce4

drivers/usb/dwc3/dwc3-exynos.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev) 
	for (i = 0; i < exynos->num_clks; i++) {

		ret = clk_prepare_enable(exynos->clks[i]);

		if (ret) {

			while (--i > 0)

			while (i-- > 0)

				clk_disable_unprepare(exynos->clks[i]);

			return ret;

		}
@@ -223,7 +223,7 @@ static int dwc3_exynos_resume(struct device *dev) 
	for (i = 0; i < exynos->num_clks; i++) {

		ret = clk_prepare_enable(exynos->clks[i]);

		if (ret) {

			while (--i > 0)

			while (i-- > 0)

				clk_disable_unprepare(exynos->clks[i]);

			return ret;

		}

drivers/usb/dwc3/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ static void dwc3_prepare_one_trb_linear(struct dwc3_ep *dep, 
	unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc);

	unsigned int rem = length % maxp;



	if (rem && usb_endpoint_dir_out(dep->endpoint.desc)) {

	if ((!length || rem) && usb_endpoint_dir_out(dep->endpoint.desc)) {

		struct dwc3	*dwc = dep->dwc;

		struct dwc3_trb	*trb;

drivers/usb/gadget/udc/net2272.c

+1 −1
Original line number Diff line number Diff line
@@ -2083,7 +2083,7 @@ static irqreturn_t net2272_irq(int irq, void *_dev) 
#if defined(PLX_PCI_RDK2)

	/* see if PCI int for us by checking irqstat */

	intcsr = readl(dev->rdk2.fpga_base_addr + RDK2_IRQSTAT);

	if (!intcsr & (1 << NET2272_PCI_IRQ)) {

	if (!(intcsr & (1 << NET2272_PCI_IRQ))) {

		spin_unlock(&dev->lock);

		return IRQ_NONE;

	}

drivers/usb/musb/musb_gadget.c

+1 −12
Original line number Diff line number Diff line
@@ -452,13 +452,10 @@ void musb_g_tx(struct musb *musb, u8 epnum) 
	}



	if (request) {

		u8	is_dma = 0;

		bool	short_packet = false;



		trace_musb_req_tx(req);



		if (dma && (csr & MUSB_TXCSR_DMAENAB)) {

			is_dma = 1;

			csr |= MUSB_TXCSR_P_WZC_BITS;

			csr &= ~(MUSB_TXCSR_DMAENAB | MUSB_TXCSR_P_UNDERRUN |

				 MUSB_TXCSR_TXPKTRDY | MUSB_TXCSR_AUTOSET);
@@ -476,16 +473,8 @@ void musb_g_tx(struct musb *musb, u8 epnum) 
		 */

		if ((request->zero && request->length)

			&& (request->length % musb_ep->packet_sz == 0)

			&& (request->actual == request->length))

				short_packet = true;

			&& (request->actual == request->length)) {



		if ((musb_dma_inventra(musb) || musb_dma_ux500(musb)) &&

			(is_dma && (!dma->desired_mode ||

				(request->actual &

					(musb_ep->packet_sz - 1)))))

				short_packet = true;



		if (short_packet) {

			/*

			 * On DMA completion, FIFO may not be

			 * available yet...

drivers/usb/musb/musbhsdma.c

+11 −10
Original line number Diff line number Diff line
@@ -346,12 +346,10 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) 
				channel->status = MUSB_DMA_STATUS_FREE;



				/* completed */

				if ((devctl & MUSB_DEVCTL_HM)

					&& (musb_channel->transmit)

					&& ((channel->desired_mode == 0)

					    || (channel->actual_len &

					    (musb_channel->max_packet_sz - 1)))

				    ) {

				if (musb_channel->transmit &&

					(!channel->desired_mode ||

					(channel->actual_len %

					    musb_channel->max_packet_sz))) {

					u8  epnum  = musb_channel->epnum;

					int offset = musb->io.ep_offset(epnum,

								    MUSB_TXCSR);
@@ -363,11 +361,14 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) 
					 */

					musb_ep_select(mbase, epnum);

					txcsr = musb_readw(mbase, offset);

					if (channel->desired_mode == 1) {

						txcsr &= ~(MUSB_TXCSR_DMAENAB

							| MUSB_TXCSR_AUTOSET);

						musb_writew(mbase, offset, txcsr);

						/* Send out the packet */

						txcsr &= ~MUSB_TXCSR_DMAMODE;

						txcsr |= MUSB_TXCSR_DMAENAB;

					}

					txcsr |=  MUSB_TXCSR_TXPKTRDY;

					musb_writew(mbase, offset, txcsr);

				}