From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] usb: gadget: musb: fix short isoc packets with inventra dma From: Bin Liu Message-Id: <20190109150215.GJ25910@uda0271908> Date: Wed, 9 Jan 2019 09:02:15 -0600 To: Paul Elder Cc: laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, drinkcat@chromium.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: SGkgUGF1bCwKCk9uIFdlZCwgSmFuIDA5LCAyMDE5IGF0IDAyOjEwOjA5QU0gLTA1MDAsIFBhdWwg RWxkZXIgd3JvdGU6Cj4gSGFuZGxpbmcgc2hvcnQgcGFja2V0cyAobGVuZ3RoIDwgbWF4IHBhY2tl dCBzaXplKSBpbiB0aGUgSW52ZW50cmEgRE1BCj4gZW5naW5lIGluIHRoZSBNVVNCIGRyaXZlciBj YXVzZXMgdGhlIE1VU0IgRE1BIGNvbnRyb2xsZXIgdG8gaGFuZy4gQW4KPiBleGFtcGxlIG9mIGEg cHJvYmxlbSB0aGF0IGlzIGNhdXNlZCBieSB0aGlzIHByb2JsZW0gaXMgd2hlbiBzdHJlYW1pbmcK PiB2aWRlbyBvdXQgb2YgYSBVVkMgZ2FkZ2V0LCBvbmx5IHRoZSBmaXJzdCB2aWRlbyBmcmFtZSBp cyB0cmFuc2ZlcnJlZC4KPiAKPiBGb3Igc2hvcnQgcGFja2V0cyAobW9kZS0wIG9yIG1vZGUtMSBE TUEpLCBNVVNCX1RYQ1NSX1RYUEtUUkRZIG11c3QgYmUKPiBzZXQgbWFudWFsbHkgYnkgdGhlIGRy aXZlci4gVGhpcyB3YXMgcHJldmlvdXNseSBkb25lIGluIG11c2JfZ190eAo+IChtdXNiX2dhZGdl dC5jKSwgYnV0IGluY29ycmVjdGx5IChhbGwgY3NyIGZsYWdzIHdlcmUgY2xlYXJlZCwgYW5kIG9u bHkKPiBNVVNCX1RYQ1NSX01PREUgYW5kIE1VU0JfVFhDU1JfVFhQS1RSRFkgd2VyZSBzZXQpLiBG aXhpbmcgdGhhdCBwcm9ibGVtCj4gYWxsb3dzIHNvbWUgcmVxdWVzdHMgdG8gYmUgdHJhbnNmZXJy ZWQgY29ycmVjdGx5LCBidXQgbXVsdGlwbGUgcmVxdWVzdHMKPiB3ZXJlIG9mdGVuIHB1dCB0b2dl dGhlciBpbiBvbmUgVVNCIHBhY2tldCwgYW5kIGNhdXNlZCBwcm9ibGVtcyBpZiB0aGUKPiBwYWNr ZXQgc2l6ZSB3YXMgbm90IGEgbXVsdGlwbGUgb2YgNC4gSW5zdGVhZCwgc2V0IE1VU0JfVFhDU1Jf VFhQS1RSRFkKPiBpbiBkbWFfY29udHJvbGxlcl9pcnEgKG11c2Joc2RtYS5jKSwganVzdCBsaWtl IGhvc3QgbW9kZSB0cmFuc2ZlcnMuCj4gCj4gVGhpcyB0b3BpYyB3YXMgb3JpZ2luYWxseSB0YWNr bGVkIGJ5IE5pY29sYXMgQm9pY2hhdCBbMF0gWzFdIGFuZCBpcwo+IGRpc2N1c3NlZCBmdXJ0aGVy IGF0IFsyXSBhcyBwYXJ0IG9mIGhpcyBHU29DIHByb2plY3QgWzNdLgo+IAo+IFswXSBodHRwczov L2dyb3Vwcy5nb29nbGUuY29tL2ZvcnVtLz9obD1lbiMhdG9waWMvYmVhZ2xlYm9hcmQtZ3NvYy9r OEF6d2ZwNzVDVQo+IFsxXSBodHRwczovL2dpdG9yaW91cy5vcmcvYmVhZ2xlYm9hcmQtdXNic25p ZmZlci9iZWFnbGVib2FyZC11c2JzbmlmZmVyLWtlcm5lbC9jb21taXQvYjBiZTNiNmNjMTk1YmE3 MzIxODliMDRmMWQ0M2VjODQzYzNlNTRjOT9wPWJlYWdsZWJvYXJkLXVzYnNuaWZmZXI6YmVhZ2xl Ym9hcmQtdXNic25pZmZlci1rZXJuZWwuZ2l0O2E9cGF0Y2g7aD1iMGJlM2I2Y2MxOTViYTczMjE4 OWIwNGYxZDQzZWM4NDNjM2U1NGM5Cj4gWzJdIGh0dHA6Ly9iZWFnbGVib2FyZC11c2JzbmlmZmVy LmJsb2dzcG90LmNvbS8yMDEwLzA3L211c2ItaXNvY2hyb25vdXMtdHJhbnNmZXJzLWZpeGVkLmh0 bWwKPiBbM10gaHR0cDovL2VsaW51eC5vcmcvQmVhZ2xlQm9hcmQvR1NvQy9VU0JTbmlmZmVyCj4g Cj4gU2lnbmVkLW9mZi1ieTogUGF1bCBFbGRlciA8cGF1bC5lbGRlckBpZGVhc29uYm9hcmQuY29t Pgo+IC0tLQo+IENoYW5nZXMgaW4gdjI6Cj4gCj4gLSBubyBtb3JlIGZsdXNoaW5nIEZJRk8KPiAt IGdyZWF0bHkgc2ltcGxpZmllZCBzaG9ydCBwYWNrZXQgaWYgZ3VhcmQgaW4gbXVzYl9nX3R4LCBh bmQgcmVtb3ZlZAo+ICAgdW5uZWNlc3NhcnkgdmFyaWFibGVzCj4gLSBtaW5vciBpbmRlbnRhdGlv biBhbmQgd29yZGluZyBjaGFuZ2VzCj4gCj4gIGRyaXZlcnMvdXNiL211c2IvbXVzYl9nYWRnZXQu YyB8IDE5ICsrKysrLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVycy91c2IvbXVzYi9tdXNiaHNkbWEu YyAgIHwgMjEgKysrKysrKysrKystLS0tLS0tLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5z ZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNi L211c2IvbXVzYl9nYWRnZXQuYyBiL2RyaXZlcnMvdXNiL211c2IvbXVzYl9nYWRnZXQuYwo+IGlu ZGV4IGVhZThiMWIxYjQ1Yi4uNDk2NjQzZjU0ZmFhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNi L211c2IvbXVzYl9nYWRnZXQuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL211c2IvbXVzYl9nYWRnZXQu Ywo+IEBAIC00NTIsMTMgKzQ1MiwxMCBAQCB2b2lkIG11c2JfZ190eChzdHJ1Y3QgbXVzYiAqbXVz YiwgdTggZXBudW0pCj4gIAl9Cj4gIAo+ICAJaWYgKHJlcXVlc3QpIHsKPiAtCQl1OAlpc19kbWEg PSAwOwo+IC0JCWJvb2wJc2hvcnRfcGFja2V0ID0gZmFsc2U7Cj4gIAo+ICAJCXRyYWNlX211c2Jf cmVxX3R4KHJlcSk7Cj4gIAo+ICAJCWlmIChkbWEgJiYgKGNzciAmIE1VU0JfVFhDU1JfRE1BRU5B QikpIHsKPiAtCQkJaXNfZG1hID0gMTsKPiAgCQkJY3NyIHw9IE1VU0JfVFhDU1JfUF9XWkNfQklU UzsKPiAgCQkJY3NyICY9IH4oTVVTQl9UWENTUl9ETUFFTkFCIHwgTVVTQl9UWENTUl9QX1VOREVS UlVOIHwKPiAgCQkJCSBNVVNCX1RYQ1NSX1RYUEtUUkRZIHwgTVVTQl9UWENTUl9BVVRPU0VUKTsK PiBAQCAtNDc2LDE2ICs0NzMsOCBAQCB2b2lkIG11c2JfZ190eChzdHJ1Y3QgbXVzYiAqbXVzYiwg dTggZXBudW0pCj4gIAkJICovCj4gIAkJaWYgKChyZXF1ZXN0LT56ZXJvICYmIHJlcXVlc3QtPmxl bmd0aCkKPiAgCQkJJiYgKHJlcXVlc3QtPmxlbmd0aCAlIG11c2JfZXAtPnBhY2tldF9zeiA9PSAw KQo+IC0JCQkmJiAocmVxdWVzdC0+YWN0dWFsID09IHJlcXVlc3QtPmxlbmd0aCkpCj4gLQkJCQlz aG9ydF9wYWNrZXQgPSB0cnVlOwo+ICsJCQkmJiAocmVxdWVzdC0+YWN0dWFsID09IHJlcXVlc3Qt Pmxlbmd0aCkpIHsKPiAgCj4gLQkJaWYgKChtdXNiX2RtYV9pbnZlbnRyYShtdXNiKSB8fCBtdXNi X2RtYV91eDUwMChtdXNiKSkgJiYKPiAtCQkJKGlzX2RtYSAmJiAoIWRtYS0+ZGVzaXJlZF9tb2Rl IHx8Cj4gLQkJCQkocmVxdWVzdC0+YWN0dWFsICYKPiAtCQkJCQkobXVzYl9lcC0+cGFja2V0X3N6 IC0gMSkpKSkpCj4gLQkJCQlzaG9ydF9wYWNrZXQgPSB0cnVlOwo+IC0KPiAtCQlpZiAoc2hvcnRf cGFja2V0KSB7Cj4gIAkJCS8qCj4gIAkJCSAqIE9uIERNQSBjb21wbGV0aW9uLCBGSUZPIG1heSBu b3QgYmUKPiAgCQkJICogYXZhaWxhYmxlIHlldC4uLgo+IEBAIC00OTMsOCArNDgyLDEwIEBAIHZv aWQgbXVzYl9nX3R4KHN0cnVjdCBtdXNiICptdXNiLCB1OCBlcG51bSkKPiAgCQkJaWYgKGNzciAm IE1VU0JfVFhDU1JfVFhQS1RSRFkpCj4gIAkJCQlyZXR1cm47Cj4gIAo+IC0JCQltdXNiX3dyaXRl dyhlcGlvLCBNVVNCX1RYQ1NSLCBNVVNCX1RYQ1NSX01PREUKPiAtCQkJCQl8IE1VU0JfVFhDU1Jf VFhQS1RSRFkpOwo+ICsJCQltdXNiX2RiZyhtdXNiLCAic2VuZGluZyBzaG9ydCBwa3QgKHplcm89 JWQsIGxlbmd0aD0lZCwgYWN0dWFsPSVkLCBkbWEtPmRlc2lyZWRfbW9kZT0lZClcbiIsCj4gKwkJ CQkgcmVxdWVzdC0+emVybywgcmVxdWVzdC0+bGVuZ3RoLCByZXF1ZXN0LT5hY3R1YWwsCj4gKwkJ CQkgZG1hLT5kZXNpcmVkX21vZGUpOwo+ICsJCQltdXNiX3dyaXRldyhlcGlvLCBNVVNCX1RYQ1NS LCBjc3IgfCBNVVNCX1RYQ1NSX1RYUEtUUkRZKTsKClNvcnJ5IEkgZGlkbid0IGNhdGNoIHRoaXMg aW4gdGhlIGxhc3QgcmV2aWV3LCBidXQgdGhpcyBjaGFuZ2Ugc2VlbXMgbm90CnJlcXVpcmVkLCBp c24ndCBpdD8gSW4gdGhlIGZpcnN0IHZlcnNpb24gb2YgdGhlIHBhdGNoLCB0aGUgY29kZSBpcwon cmV0dXJuZWQnIGluIHRoZSAnaWYgKG11c2JfZG1hX2ludmVudHJhKCkpJyBicmFuY2ggYWJvdmUs IGRvZXNuJ3QgcmVhY2gKaGVyZS4KClJlZ2FyZHMsCi1CaW4uCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB046C43387 for ; Wed, 9 Jan 2019 15:02:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84EE3206BB for ; Wed, 9 Jan 2019 15:02:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="V+4jgxEu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731942AbfAIPCV (ORCPT ); Wed, 9 Jan 2019 10:02:21 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:50384 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731686AbfAIPCV (ORCPT ); Wed, 9 Jan 2019 10:02:21 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x09F2FMT022547; Wed, 9 Jan 2019 09:02:15 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1547046135; bh=tjIam1Hh0q2N2IHJsaY/bqc93Ln54cvop9DBrAyB7A8=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=V+4jgxEu01BAn230NWrG3OCD5IgaEKZa6J/QWr4Xe2QksmluiP27yLcHsE4D5esyw xcWd3eEmCHHwKxoxEaQLGK3/BraGwWLiSI/WOf3BAF44VvcwO1HfGVr+oP/UcGkW8L itet87LicAfuowtvXaY3gRpp5groevJlT5QnCeVo= Received: from DLEE103.ent.ti.com (dlee103.ent.ti.com [157.170.170.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x09F2F9a050773 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 9 Jan 2019 09:02:15 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Wed, 9 Jan 2019 09:02:15 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Wed, 9 Jan 2019 09:02:15 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id x09F2F2D000548; Wed, 9 Jan 2019 09:02:15 -0600 Date: Wed, 9 Jan 2019 09:02:15 -0600 From: Bin Liu To: Paul Elder CC: , , , , , , Subject: Re: [PATCH v2] usb: gadget: musb: fix short isoc packets with inventra dma Message-ID: <20190109150215.GJ25910@uda0271908> Mail-Followup-To: Bin Liu , Paul Elder , laurent.pinchart@ideasonboard.com, kieran.bingham@ideasonboard.com, drinkcat@chromium.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org References: <20190109071009.27625-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20190109071009.27625-1-paul.elder@ideasonboard.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, On Wed, Jan 09, 2019 at 02:10:09AM -0500, Paul Elder wrote: > Handling short packets (length < max packet size) in the Inventra DMA > engine in the MUSB driver causes the MUSB DMA controller to hang. An > example of a problem that is caused by this problem is when streaming > video out of a UVC gadget, only the first video frame is transferred. > > For short packets (mode-0 or mode-1 DMA), MUSB_TXCSR_TXPKTRDY must be > set manually by the driver. This was previously done in musb_g_tx > (musb_gadget.c), but incorrectly (all csr flags were cleared, and only > MUSB_TXCSR_MODE and MUSB_TXCSR_TXPKTRDY were set). Fixing that problem > allows some requests to be transferred correctly, but multiple requests > were often put together in one USB packet, and caused problems if the > packet size was not a multiple of 4. Instead, set MUSB_TXCSR_TXPKTRDY > in dma_controller_irq (musbhsdma.c), just like host mode transfers. > > This topic was originally tackled by Nicolas Boichat [0] [1] and is > discussed further at [2] as part of his GSoC project [3]. > > [0] https://groups.google.com/forum/?hl=en#!topic/beagleboard-gsoc/k8Azwfp75CU > [1] https://gitorious.org/beagleboard-usbsniffer/beagleboard-usbsniffer-kernel/commit/b0be3b6cc195ba732189b04f1d43ec843c3e54c9?p=beagleboard-usbsniffer:beagleboard-usbsniffer-kernel.git;a=patch;h=b0be3b6cc195ba732189b04f1d43ec843c3e54c9 > [2] http://beagleboard-usbsniffer.blogspot.com/2010/07/musb-isochronous-transfers-fixed.html > [3] http://elinux.org/BeagleBoard/GSoC/USBSniffer > > Signed-off-by: Paul Elder > --- > Changes in v2: > > - no more flushing FIFO > - greatly simplified short packet if guard in musb_g_tx, and removed > unnecessary variables > - minor indentation and wording changes > > drivers/usb/musb/musb_gadget.c | 19 +++++-------------- > drivers/usb/musb/musbhsdma.c | 21 +++++++++++---------- > 2 files changed, 16 insertions(+), 24 deletions(-) > > diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c > index eae8b1b1b45b..496643f54faa 100644 > --- a/drivers/usb/musb/musb_gadget.c > +++ b/drivers/usb/musb/musb_gadget.c > @@ -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... > @@ -493,8 +482,10 @@ void musb_g_tx(struct musb *musb, u8 epnum) > if (csr & MUSB_TXCSR_TXPKTRDY) > return; > > - musb_writew(epio, MUSB_TXCSR, MUSB_TXCSR_MODE > - | MUSB_TXCSR_TXPKTRDY); > + musb_dbg(musb, "sending short pkt (zero=%d, length=%d, actual=%d, dma->desired_mode=%d)\n", > + request->zero, request->length, request->actual, > + dma->desired_mode); > + musb_writew(epio, MUSB_TXCSR, csr | MUSB_TXCSR_TXPKTRDY); Sorry I didn't catch this in the last review, but this change seems not required, isn't it? In the first version of the patch, the code is 'returned' in the 'if (musb_dma_inventra())' branch above, doesn't reach here. Regards, -Bin.