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

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

Merge tag 'fixes-for-v4.6-rc2' of... 

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

Felipe writes:

usb: fixes for v4.6-rc2

A couple fixes for the new SuperSpeedPlus that went
in during this merge window. Also two minor fixes
for dwc3 (one for setting endpoint naming correctly
and another to improve time spent in our reset
sequence) and an old bug fix on Atmel UDC which was
disabling endpoints when it shouldn't.

There's also a build breakage fix to the qcom phy
driver and a fix to the f_midi gadget to avoid a
race condition with f_midi_transmit().
parents f55532a0 7e8ac87a

drivers/usb/dwc3/core.c

+18 −30
Original line number Diff line number Diff line
@@ -67,23 +67,9 @@ void dwc3_set_mode(struct dwc3 *dwc, u32 mode) 
static int dwc3_core_soft_reset(struct dwc3 *dwc)

{

	u32		reg;

	int		retries = 1000;

	int		ret;



	/* Before Resetting PHY, put Core in Reset */

	reg = dwc3_readl(dwc->regs, DWC3_GCTL);

	reg |= DWC3_GCTL_CORESOFTRESET;

	dwc3_writel(dwc->regs, DWC3_GCTL, reg);



	/* Assert USB3 PHY reset */

	reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));

	reg |= DWC3_GUSB3PIPECTL_PHYSOFTRST;

	dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);



	/* Assert USB2 PHY reset */

	reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));

	reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;

	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);



	usb_phy_init(dwc->usb2_phy);

	usb_phy_init(dwc->usb3_phy);

	ret = phy_init(dwc->usb2_generic_phy);
@@ -95,26 +81,28 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc) 
		phy_exit(dwc->usb2_generic_phy);

		return ret;

	}

	mdelay(100);



	/* Clear USB3 PHY reset */

	reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));

	reg &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST;

	dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);

	/*

	 * We're resetting only the device side because, if we're in host mode,

	 * XHCI driver will reset the host block. If dwc3 was configured for

	 * host-only mode, then we can return early.

	 */

	if (dwc->dr_mode == USB_DR_MODE_HOST)

		return 0;



	/* Clear USB2 PHY reset */

	reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));

	reg &= ~DWC3_GUSB2PHYCFG_PHYSOFTRST;

	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);

	reg = dwc3_readl(dwc->regs, DWC3_DCTL);

	reg |= DWC3_DCTL_CSFTRST;

	dwc3_writel(dwc->regs, DWC3_DCTL, reg);



	mdelay(100);

	do {

		reg = dwc3_readl(dwc->regs, DWC3_DCTL);

		if (!(reg & DWC3_DCTL_CSFTRST))

			return 0;



	/* After PHYs are stable we can take Core out of reset state */

	reg = dwc3_readl(dwc->regs, DWC3_GCTL);

	reg &= ~DWC3_GCTL_CORESOFTRESET;

	dwc3_writel(dwc->regs, DWC3_GCTL, reg);

		udelay(1);

	} while (--retries);



	return 0;

	return -ETIMEDOUT;

}



/**

drivers/usb/dwc3/gadget.c

+8 −3
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, 
		dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);



		if (!usb_endpoint_xfer_isoc(desc))

			return 0;

			goto out;



		/* Link TRB for ISOC. The HWO bit is never reset */

		trb_st_hw = &dep->trb_pool[0];
@@ -582,9 +582,10 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, 
		trb_link->ctrl |= DWC3_TRB_CTRL_HWO;

	}



out:

	switch (usb_endpoint_type(desc)) {

	case USB_ENDPOINT_XFER_CONTROL:

		strlcat(dep->name, "-control", sizeof(dep->name));

		/* don't change name */

		break;

	case USB_ENDPOINT_XFER_ISOC:

		strlcat(dep->name, "-isoc", sizeof(dep->name));
@@ -2487,7 +2488,11 @@ static void dwc3_gadget_wakeup_interrupt(struct dwc3 *dwc) 
	 * implemented.

	 */



	if (dwc->gadget_driver && dwc->gadget_driver->resume) {

		spin_unlock(&dwc->lock);

		dwc->gadget_driver->resume(&dwc->gadget);

		spin_lock(&dwc->lock);

	}

}



static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,

drivers/usb/gadget/composite.c

+5 −3
Original line number Diff line number Diff line
@@ -656,7 +656,8 @@ static int bos_desc(struct usb_composite_dev *cdev) 
		ssp_cap->bmAttributes = cpu_to_le32(1);



		/* Min RX/TX Lane Count = 1 */

		ssp_cap->wFunctionalitySupport = (1 << 8) | (1 << 12);

		ssp_cap->wFunctionalitySupport =

			cpu_to_le16((1 << 8) | (1 << 12));



		/*

		 * bmSublinkSpeedAttr[0]:
@@ -666,7 +667,7 @@ static int bos_desc(struct usb_composite_dev *cdev) 
		 *   LSM = 10 (10 Gbps)

		 */

		ssp_cap->bmSublinkSpeedAttr[0] =

			(3 << 4) | (1 << 14) | (0xa << 16);

			cpu_to_le32((3 << 4) | (1 << 14) | (0xa << 16));

		/*

		 * bmSublinkSpeedAttr[1] =

		 *   ST  = Symmetric, TX
@@ -675,7 +676,8 @@ static int bos_desc(struct usb_composite_dev *cdev) 
		 *   LSM = 10 (10 Gbps)

		 */

		ssp_cap->bmSublinkSpeedAttr[1] =

			(3 << 4) | (1 << 14) | (0xa << 16) | (1 << 7);

			cpu_to_le32((3 << 4) | (1 << 14) |

				    (0xa << 16) | (1 << 7));

	}



	return le16_to_cpu(bos->wTotalLength);

drivers/usb/gadget/function/f_midi.c

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/slab.h>

#include <linux/device.h>

#include <linux/kfifo.h>

#include <linux/spinlock.h>



#include <sound/core.h>

#include <sound/initval.h>
@@ -89,6 +90,7 @@ struct f_midi { 
	unsigned int buflen, qlen;

	/* This fifo is used as a buffer ring for pre-allocated IN usb_requests */

	DECLARE_KFIFO_PTR(in_req_fifo, struct usb_request *);

	spinlock_t transmit_lock;

	unsigned int in_last_port;



	struct gmidi_in_port	in_ports_array[/* in_ports */];
@@ -597,17 +599,22 @@ static void f_midi_transmit(struct f_midi *midi) 
{

	struct usb_ep *ep = midi->in_ep;

	int ret;

	unsigned long flags;



	/* We only care about USB requests if IN endpoint is enabled */

	if (!ep || !ep->enabled)

		goto drop_out;



	spin_lock_irqsave(&midi->transmit_lock, flags);



	do {

		ret = f_midi_do_transmit(midi, ep);

		if (ret < 0)

			goto drop_out;

	} while (ret);



	spin_unlock_irqrestore(&midi->transmit_lock, flags);



	return;



drop_out:
@@ -1201,6 +1208,8 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi) 
	if (status)

		goto setup_fail;



	spin_lock_init(&midi->transmit_lock);



	++opts->refcnt;

	mutex_unlock(&opts->lock);

drivers/usb/gadget/udc/atmel_usba_udc.c

+0 −14
Original line number Diff line number Diff line
@@ -1045,20 +1045,6 @@ static void reset_all_endpoints(struct usba_udc *udc) 
		list_del_init(&req->queue);

		request_complete(ep, req, -ECONNRESET);

	}



	/* NOTE:  normally, the next call to the gadget driver is in

	 * charge of disabling endpoints... usually disconnect().

	 * The exception would be entering a high speed test mode.

	 *

	 * FIXME remove this code ... and retest thoroughly.

	 */

	list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {

		if (ep->ep.desc) {

			spin_unlock(&udc->lock);

			usba_ep_disable(&ep->ep);

			spin_lock(&udc->lock);

		}

	}

}



static struct usba_ep *get_ep_by_addr(struct usba_udc *udc, u16 wIndex)