Patch "usb: dwc3: gadget: set PCM1 field of isochronous-first TRBs" has been added to the 4.9-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2017-01-03 19:58:27
This is a note to let you know that I've just added the patch titled
usb: dwc3: gadget: set PCM1 field of isochronous-first TRBs
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-dwc3-gadget-set-pcm1-field-of-isochronous-first-trbs.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 6b9018d4c1e5c958625be94a160a5984351d4632 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <redacted> Date: Thu, 22 Sep 2016 11:01:01 +0300 Subject: usb: dwc3: gadget: set PCM1 field of isochronous-first TRBs From: Felipe Balbi <redacted> commit 6b9018d4c1e5c958625be94a160a5984351d4632 upstream. In case of High-Speed, High-Bandwidth endpoints, we need to tell DWC3 that we have more than one packet per interval. We do that by setting PCM1 field of Isochronous-First TRB. Signed-off-by: Felipe Balbi <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/dwc3/gadget.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c@@ -771,6 +771,9 @@ static void dwc3_prepare_one_trb(struct unsigned length, unsigned chain, unsigned node) { struct dwc3_trb *trb; + struct dwc3 *dwc = dep->dwc; + struct usb_gadget *gadget = &dwc->gadget; + enum usb_device_speed speed = gadget->speed; dwc3_trace(trace_dwc3_gadget, "%s: req %p dma %08llx length %d%s", dep->name, req, (unsigned long long) dma,
@@ -798,10 +801,16 @@ static void dwc3_prepare_one_trb(struct break; case USB_ENDPOINT_XFER_ISOC: - if (!node) + if (!node) { trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST; - else + + if (speed == USB_SPEED_HIGH) { + struct usb_ep *ep = &dep->endpoint; + trb->size |= DWC3_TRB_SIZE_PCM1(ep->mult - 1); + } + } else { trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS; + } /* always enable Interrupt on Missed ISOC */ trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI;
Patches currently in stable-queue which might be from felipe.balbi@linux.intel.com are queue-4.9/usb-gadget-composite-always-set-ep-mult-to-a-sensible-value.patch queue-4.9/usb-gadget-f_uac2-fix-error-handling-at-afunc_bind.patch queue-4.9/usb-dwc3-gadget-set-pcm1-field-of-isochronous-first-trbs.patch queue-4.9/usb-gadget-composite-correctly-initialize-ep-maxpacket.patch