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

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

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

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

Felipe writes:

usb: fixes for v4.8-rc1

First set of fixes for v4.8-rc cycle. Again, dwc3 is
the most active driver with over 60% of this pull
request touching it.

The most important fixes are related to scatterlist
usage with dwc3. Before this pull request, we were
increment request->actual multiple times and this
would result in request->actual being larger than
request->length.

Also, if a we received a short packet midway through
processing a scatterlist, we were not clearning HWO
bit as we should.

Other than the large dwc3 scatterlist fixes, we have
a new Device ID for Intel's Kabylake silicon.

Other drivers, such as fsl_qe_udc and renesas udc,
also got a few minor fixes. Details are in shortlog.
parents 59b71f77 a0ad85ae

drivers/usb/dwc3/dwc3-of-simple.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static int dwc3_of_simple_probe(struct platform_device *pdev) 
	if (!simple->clks)

		return -ENOMEM;



	platform_set_drvdata(pdev, simple);

	simple->dev = dev;



	for (i = 0; i < simple->num_clocks; i++) {

drivers/usb/dwc3/dwc3-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define PCI_DEVICE_ID_INTEL_BXT			0x0aaa

#define PCI_DEVICE_ID_INTEL_BXT_M		0x1aaa

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa

#define PCI_DEVICE_ID_INTEL_KBP			0xa2b0



static const struct acpi_gpio_params reset_gpios = { 0, 0, false };

static const struct acpi_gpio_params cs_gpios = { 1, 0, false };
@@ -227,6 +228,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT_M), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_KBP), },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },

	{  }	/* Terminating Entry */

};

drivers/usb/dwc3/gadget.c

+33 −22
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, 
	if (!req->request.no_interrupt && !chain)

		trb->ctrl |= DWC3_TRB_CTRL_IOC | DWC3_TRB_CTRL_ISP_IMI;



	if (last)

	if (last && !usb_endpoint_xfer_isoc(dep->endpoint.desc))

		trb->ctrl |= DWC3_TRB_CTRL_LST;



	if (chain)
@@ -1955,7 +1955,8 @@ static void dwc3_gadget_free_endpoints(struct dwc3 *dwc) 


static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep,

		struct dwc3_request *req, struct dwc3_trb *trb,

		const struct dwc3_event_depevt *event, int status)

		const struct dwc3_event_depevt *event, int status,

		int chain)

{

	unsigned int		count;

	unsigned int		s_pkt = 0;
@@ -1964,17 +1965,22 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep, 
	dep->queued_requests--;

	trace_dwc3_complete_trb(dep, trb);



	if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)

	/*

		 * We continue despite the error. There is not much we

		 * can do. If we don't clean it up we loop forever. If

		 * we skip the TRB then it gets overwritten after a

		 * while since we use them in a ring buffer. A BUG()

		 * would help. Lets hope that if this occurs, someone

		 * fixes the root cause instead of looking away :)

	 * If we're in the middle of series of chained TRBs and we

	 * receive a short transfer along the way, DWC3 will skip

	 * through all TRBs including the last TRB in the chain (the

	 * where CHN bit is zero. DWC3 will also avoid clearing HWO

	 * bit and SW has to do it manually.

	 *

	 * We're going to do that here to avoid problems of HW trying

	 * to use bogus TRBs for transfers.

	 */

		dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n",

				dep->name, trb);

	if (chain && (trb->ctrl & DWC3_TRB_CTRL_HWO))

		trb->ctrl &= ~DWC3_TRB_CTRL_HWO;



	if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)

		return 1;



	count = trb->size & DWC3_TRB_SIZE_MASK;



	if (dep->direction) {
@@ -2013,15 +2019,7 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep, 
			s_pkt = 1;

	}



	/*

	 * We assume here we will always receive the entire data block

	 * which we should receive. Meaning, if we program RX to

	 * receive 4K but we receive only 2K, we assume that's all we

	 * should receive and we simply bounce the request back to the

	 * gadget driver for further processing.

	 */

	req->request.actual += req->request.length - count;

	if (s_pkt)

	if (s_pkt && !chain)

		return 1;

	if ((event->status & DEPEVT_STATUS_LST) &&

			(trb->ctrl & (DWC3_TRB_CTRL_LST |
@@ -2040,13 +2038,17 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep, 
	struct dwc3_trb		*trb;

	unsigned int		slot;

	unsigned int		i;

	int			count = 0;

	int			ret;



	do {

		int chain;



		req = next_request(&dep->started_list);

		if (WARN_ON_ONCE(!req))

			return 1;



		chain = req->request.num_mapped_sgs > 0;

		i = 0;

		do {

			slot = req->first_trb_index + i;
@@ -2054,13 +2056,22 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep, 
				slot++;

			slot %= DWC3_TRB_NUM;

			trb = &dep->trb_pool[slot];

			count += trb->size & DWC3_TRB_SIZE_MASK;



			ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,

					event, status);

					event, status, chain);

			if (ret)

				break;

		} while (++i < req->request.num_mapped_sgs);



		/*

		 * We assume here we will always receive the entire data block

		 * which we should receive. Meaning, if we program RX to

		 * receive 4K but we receive only 2K, we assume that's all we

		 * should receive and we simply bounce the request back to the

		 * gadget driver for further processing.

		 */

		req->request.actual += req->request.length - count;

		dwc3_gadget_giveback(dep, req, status);



		if (ret)

drivers/usb/gadget/composite.c

+4 −2
Original line number Diff line number Diff line
@@ -1913,6 +1913,8 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			break;



		case USB_RECIP_ENDPOINT:

			if (!cdev->config)

				break;

			endp = ((w_index & 0x80) >> 3) | (w_index & 0x0f);

			list_for_each_entry(f, &cdev->config->functions, list) {

				if (test_bit(endp, f->endpoints))
@@ -2124,14 +2126,14 @@ int composite_os_desc_req_prepare(struct usb_composite_dev *cdev, 


	cdev->os_desc_req = usb_ep_alloc_request(ep0, GFP_KERNEL);

	if (!cdev->os_desc_req) {

		ret = PTR_ERR(cdev->os_desc_req);

		ret = -ENOMEM;

		goto end;

	}



	/* OS feature descriptor length <= 4kB */

	cdev->os_desc_req->buf = kmalloc(4096, GFP_KERNEL);

	if (!cdev->os_desc_req->buf) {

		ret = PTR_ERR(cdev->os_desc_req->buf);

		ret = -ENOMEM;

		kfree(cdev->os_desc_req);

		goto end;

	}

drivers/usb/gadget/configfs.c

+2 −0
Original line number Diff line number Diff line
@@ -1490,7 +1490,9 @@ void unregister_gadget_item(struct config_item *item) 
{

	struct gadget_info *gi = to_gadget_info(item);



	mutex_lock(&gi->lock);

	unregister_gadget(gi);

	mutex_unlock(&gi->lock);

}

EXPORT_SYMBOL_GPL(unregister_gadget_item);