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: <20190115163520.GC18026@uda0271908> Date: Tue, 15 Jan 2019 10:35:20 -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: SGkgUGF1bCwKCk9uIEZyaSwgSmFuIDExLCAyMDE5IGF0IDEyOjMxOjU5QU0gLTA1MDAsIFBhdWwg RWxkZXIgd3JvdGU6Cj4gSGkgQmluLAo+IAo+IE9uIFdlZCwgSmFuIDA5LCAyMDE5IGF0IDA5OjAy OjE1QU0gLTA2MDAsIEJpbiBMaXUgd3JvdGU6Cj4gPiBIaSBQYXVsLAo+ID4gCj4gPiBPbiBXZWQs IEphbiAwOSwgMjAxOSBhdCAwMjoxMDowOUFNIC0wNTAwLCBQYXVsIEVsZGVyIHdyb3RlOgo+ID4g PiBIYW5kbGluZyBzaG9ydCBwYWNrZXRzIChsZW5ndGggPCBtYXggcGFja2V0IHNpemUpIGluIHRo ZSBJbnZlbnRyYSBETUEKPiA+ID4gZW5naW5lIGluIHRoZSBNVVNCIGRyaXZlciBjYXVzZXMgdGhl IE1VU0IgRE1BIGNvbnRyb2xsZXIgdG8gaGFuZy4gQW4KPiA+ID4gZXhhbXBsZSBvZiBhIHByb2Js ZW0gdGhhdCBpcyBjYXVzZWQgYnkgdGhpcyBwcm9ibGVtIGlzIHdoZW4gc3RyZWFtaW5nCj4gPiA+ IHZpZGVvIG91dCBvZiBhIFVWQyBnYWRnZXQsIG9ubHkgdGhlIGZpcnN0IHZpZGVvIGZyYW1lIGlz IHRyYW5zZmVycmVkLgo+ID4gPiAKPiA+ID4gRm9yIHNob3J0IHBhY2tldHMgKG1vZGUtMCBvciBt b2RlLTEgRE1BKSwgTVVTQl9UWENTUl9UWFBLVFJEWSBtdXN0IGJlCj4gPiA+IHNldCBtYW51YWxs eSBieSB0aGUgZHJpdmVyLiBUaGlzIHdhcyBwcmV2aW91c2x5IGRvbmUgaW4gbXVzYl9nX3R4Cj4g PiA+IChtdXNiX2dhZGdldC5jKSwgYnV0IGluY29ycmVjdGx5IChhbGwgY3NyIGZsYWdzIHdlcmUg Y2xlYXJlZCwgYW5kIG9ubHkKPiA+ID4gTVVTQl9UWENTUl9NT0RFIGFuZCBNVVNCX1RYQ1NSX1RY UEtUUkRZIHdlcmUgc2V0KS4gRml4aW5nIHRoYXQgcHJvYmxlbQo+ID4gPiBhbGxvd3Mgc29tZSBy ZXF1ZXN0cyB0byBiZSB0cmFuc2ZlcnJlZCBjb3JyZWN0bHksIGJ1dCBtdWx0aXBsZSByZXF1ZXN0 cwo+ID4gPiB3ZXJlIG9mdGVuIHB1dCB0b2dldGhlciBpbiBvbmUgVVNCIHBhY2tldCwgYW5kIGNh dXNlZCBwcm9ibGVtcyBpZiB0aGUKPiA+ID4gcGFja2V0IHNpemUgd2FzIG5vdCBhIG11bHRpcGxl IG9mIDQuIEluc3RlYWQsIHNldCBNVVNCX1RYQ1NSX1RYUEtUUkRZCj4gPiA+IGluIGRtYV9jb250 cm9sbGVyX2lycSAobXVzYmhzZG1hLmMpLCBqdXN0IGxpa2UgaG9zdCBtb2RlIHRyYW5zZmVycy4K PiA+ID4gCj4gPiA+IFRoaXMgdG9waWMgd2FzIG9yaWdpbmFsbHkgdGFja2xlZCBieSBOaWNvbGFz IEJvaWNoYXQgWzBdIFsxXSBhbmQgaXMKPiA+ID4gZGlzY3Vzc2VkIGZ1cnRoZXIgYXQgWzJdIGFz IHBhcnQgb2YgaGlzIEdTb0MgcHJvamVjdCBbM10uCj4gPiA+IAo+ID4gPiBbMF0gaHR0cHM6Ly9n cm91cHMuZ29vZ2xlLmNvbS9mb3J1bS8/aGw9ZW4jIXRvcGljL2JlYWdsZWJvYXJkLWdzb2MvazhB endmcDc1Q1UKPiA+ID4gWzFdIGh0dHBzOi8vZ2l0b3Jpb3VzLm9yZy9iZWFnbGVib2FyZC11c2Jz bmlmZmVyL2JlYWdsZWJvYXJkLXVzYnNuaWZmZXIta2VybmVsL2NvbW1pdC9iMGJlM2I2Y2MxOTVi YTczMjE4OWIwNGYxZDQzZWM4NDNjM2U1NGM5P3A9YmVhZ2xlYm9hcmQtdXNic25pZmZlcjpiZWFn bGVib2FyZC11c2JzbmlmZmVyLWtlcm5lbC5naXQ7YT1wYXRjaDtoPWIwYmUzYjZjYzE5NWJhNzMy MTg5YjA0ZjFkNDNlYzg0M2MzZTU0YzkKPiA+ID4gWzJdIGh0dHA6Ly9iZWFnbGVib2FyZC11c2Jz bmlmZmVyLmJsb2dzcG90LmNvbS8yMDEwLzA3L211c2ItaXNvY2hyb25vdXMtdHJhbnNmZXJzLWZp eGVkLmh0bWwKPiA+ID4gWzNdIGh0dHA6Ly9lbGludXgub3JnL0JlYWdsZUJvYXJkL0dTb0MvVVNC U25pZmZlcgo+ID4gPiAKPiA+ID4gU2lnbmVkLW9mZi1ieTogUGF1bCBFbGRlciA8cGF1bC5lbGRl ckBpZGVhc29uYm9hcmQuY29tPgo+ID4gPiAtLS0KPiA+ID4gQ2hhbmdlcyBpbiB2MjoKPiA+ID4g Cj4gPiA+IC0gbm8gbW9yZSBmbHVzaGluZyBGSUZPCj4gPiA+IC0gZ3JlYXRseSBzaW1wbGlmaWVk IHNob3J0IHBhY2tldCBpZiBndWFyZCBpbiBtdXNiX2dfdHgsIGFuZCByZW1vdmVkCj4gPiA+ICAg dW5uZWNlc3NhcnkgdmFyaWFibGVzCj4gPiA+IC0gbWlub3IgaW5kZW50YXRpb24gYW5kIHdvcmRp bmcgY2hhbmdlcwo+ID4gPiAKPiA+ID4gIGRyaXZlcnMvdXNiL211c2IvbXVzYl9nYWRnZXQuYyB8 IDE5ICsrKysrLS0tLS0tLS0tLS0tLS0KPiA+ID4gIGRyaXZlcnMvdXNiL211c2IvbXVzYmhzZG1h LmMgICB8IDIxICsrKysrKysrKysrLS0tLS0tLS0tLQo+ID4gPiAgMiBmaWxlcyBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKPiA+ID4gCj4gPiA+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9tdXNiL211c2JfZ2FkZ2V0LmMgYi9kcml2ZXJzL3VzYi9tdXNiL211c2Jf Z2FkZ2V0LmMKPiA+ID4gaW5kZXggZWFlOGIxYjFiNDViLi40OTY2NDNmNTRmYWEgMTAwNjQ0Cj4g PiA+IC0tLSBhL2RyaXZlcnMvdXNiL211c2IvbXVzYl9nYWRnZXQuYwo+ID4gPiArKysgYi9kcml2 ZXJzL3VzYi9tdXNiL211c2JfZ2FkZ2V0LmMKPiA+ID4gQEAgLTQ1MiwxMyArNDUyLDEwIEBAIHZv aWQgbXVzYl9nX3R4KHN0cnVjdCBtdXNiICptdXNiLCB1OCBlcG51bSkKPiA+ID4gIAl9Cj4gPiA+ ICAKPiA+ID4gIAlpZiAocmVxdWVzdCkgewo+ID4gPiAtCQl1OAlpc19kbWEgPSAwOwo+ID4gPiAt CQlib29sCXNob3J0X3BhY2tldCA9IGZhbHNlOwo+ID4gPiAgCj4gPiA+ICAJCXRyYWNlX211c2Jf cmVxX3R4KHJlcSk7Cj4gPiA+ICAKPiA+ID4gIAkJaWYgKGRtYSAmJiAoY3NyICYgTVVTQl9UWENT Ul9ETUFFTkFCKSkgewo+ID4gPiAtCQkJaXNfZG1hID0gMTsKPiA+ID4gIAkJCWNzciB8PSBNVVNC X1RYQ1NSX1BfV1pDX0JJVFM7Cj4gPiA+ICAJCQljc3IgJj0gfihNVVNCX1RYQ1NSX0RNQUVOQUIg fCBNVVNCX1RYQ1NSX1BfVU5ERVJSVU4gfAo+ID4gPiAgCQkJCSBNVVNCX1RYQ1NSX1RYUEtUUkRZ IHwgTVVTQl9UWENTUl9BVVRPU0VUKTsKPiA+ID4gQEAgLTQ3NiwxNiArNDczLDggQEAgdm9pZCBt dXNiX2dfdHgoc3RydWN0IG11c2IgKm11c2IsIHU4IGVwbnVtKQo+ID4gPiAgCQkgKi8KPiA+ID4g IAkJaWYgKChyZXF1ZXN0LT56ZXJvICYmIHJlcXVlc3QtPmxlbmd0aCkKPiA+ID4gIAkJCSYmIChy ZXF1ZXN0LT5sZW5ndGggJSBtdXNiX2VwLT5wYWNrZXRfc3ogPT0gMCkKPiA+ID4gLQkJCSYmIChy ZXF1ZXN0LT5hY3R1YWwgPT0gcmVxdWVzdC0+bGVuZ3RoKSkKPiA+ID4gLQkJCQlzaG9ydF9wYWNr ZXQgPSB0cnVlOwo+ID4gPiArCQkJJiYgKHJlcXVlc3QtPmFjdHVhbCA9PSByZXF1ZXN0LT5sZW5n dGgpKSB7Cj4gPiA+ICAKPiA+ID4gLQkJaWYgKChtdXNiX2RtYV9pbnZlbnRyYShtdXNiKSB8fCBt dXNiX2RtYV91eDUwMChtdXNiKSkgJiYKPiA+ID4gLQkJCShpc19kbWEgJiYgKCFkbWEtPmRlc2ly ZWRfbW9kZSB8fAo+ID4gPiAtCQkJCShyZXF1ZXN0LT5hY3R1YWwgJgo+ID4gPiAtCQkJCQkobXVz Yl9lcC0+cGFja2V0X3N6IC0gMSkpKSkpCj4gPiA+IC0JCQkJc2hvcnRfcGFja2V0ID0gdHJ1ZTsK PiA+ID4gLQo+ID4gPiAtCQlpZiAoc2hvcnRfcGFja2V0KSB7Cj4gPiA+ICAJCQkvKgo+ID4gPiAg CQkJICogT24gRE1BIGNvbXBsZXRpb24sIEZJRk8gbWF5IG5vdCBiZQo+ID4gPiAgCQkJICogYXZh aWxhYmxlIHlldC4uLgo+ID4gPiBAQCAtNDkzLDggKzQ4MiwxMCBAQCB2b2lkIG11c2JfZ190eChz dHJ1Y3QgbXVzYiAqbXVzYiwgdTggZXBudW0pCj4gPiA+ICAJCQlpZiAoY3NyICYgTVVTQl9UWENT Ul9UWFBLVFJEWSkKPiA+ID4gIAkJCQlyZXR1cm47Cj4gPiA+ICAKPiA+ID4gLQkJCW11c2Jfd3Jp dGV3KGVwaW8sIE1VU0JfVFhDU1IsIE1VU0JfVFhDU1JfTU9ERQo+ID4gPiAtCQkJCQl8IE1VU0Jf VFhDU1JfVFhQS1RSRFkpOwo+ID4gPiArCQkJbXVzYl9kYmcobXVzYiwgInNlbmRpbmcgc2hvcnQg cGt0ICh6ZXJvPSVkLCBsZW5ndGg9JWQsIGFjdHVhbD0lZCwgZG1hLT5kZXNpcmVkX21vZGU9JWQp XG4iLAo+ID4gPiArCQkJCSByZXF1ZXN0LT56ZXJvLCByZXF1ZXN0LT5sZW5ndGgsIHJlcXVlc3Qt PmFjdHVhbCwKPiA+ID4gKwkJCQkgZG1hLT5kZXNpcmVkX21vZGUpOwo+ID4gPiArCQkJbXVzYl93 cml0ZXcoZXBpbywgTVVTQl9UWENTUiwgY3NyIHwgTVVTQl9UWENTUl9UWFBLVFJEWSk7Cj4gPiAK PiA+IFNvcnJ5IEkgZGlkbid0IGNhdGNoIHRoaXMgaW4gdGhlIGxhc3QgcmV2aWV3LCBidXQgdGhp cyBjaGFuZ2Ugc2VlbXMgbm90Cj4gPiByZXF1aXJlZCwgaXNuJ3QgaXQ/IEluIHRoZSBmaXJzdCB2 ZXJzaW9uIG9mIHRoZSBwYXRjaCwgdGhlIGNvZGUgaXMKPiA+ICdyZXR1cm5lZCcgaW4gdGhlICdp ZiAobXVzYl9kbWFfaW52ZW50cmEoKSknIGJyYW5jaCBhYm92ZSwgZG9lc24ndCByZWFjaAo+ID4g aGVyZS4KPiAKPiBEbyB5b3UgbWVhbiBjaGFuZ2UgY29tcGFyZWQgdG8gdGhlIGxhc3QgdmVyc2lv biBvZiB0aGUgcGF0Y2gsIG9yIHRoaXMKPiBsYXN0IGNodW5rIG9mIHRoZSBkaWZmPwoKSSBtZWFu dCB0aGF0IHRoZSBjaHVuayBhYm92ZSBzZWVtcyBub3QgcmVsYXRlZCB0byB0aGlzIHdlYmNhbSBz aG9ydApwYWNrZXQgdGVzdCBjYXNlLCBzbyBhbSB3b25kZXJpbmcgaWYgdGhpcyBjaGFuZ2UgaXMg bm90IG5lY2Nlc3NhcnkKCi0gICAgICAgICAgICAgICAgICBtdXNiX3dyaXRldyhlcGlvLCBNVVNC X1RYQ1NSLCBNVVNCX1RYQ1NSX01PREUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgTVVTQl9UWENTUl9UWFBLVFJEWSk7CisgICAgICAgICAgICAgICAgIG11c2Jfd3JpdGV3KGVw aW8sIE1VU0JfVFhDU1IsIGNzciB8IE1VU0JfVFhDU1JfVFhQS1RSRFkpOwoKCj4gCj4gSSBndWVz cyBJIGRpZCBhbHNvIHJlbW92ZSB0aGUgcmV0dXJuIHdoZW4gSSByZW1vdmVkIHRoZSAnaWYKPiAo bXVzYl9kbWFfaW52ZW50cmEoKSknIGJsb2NrIHRoYXQgaGFkIHRoZSBGTFVTSEZJRklPLCBidXQg d2hlbiBJIHRlc3RlZAo+IGl0IGl0IHN0aWxsIHdvcmtlZC4gSW4gZmFjdCwgSSByZXZlcnRlZCB0 aGlzIGxhc3QgZGlmZiBjaHVuayBhbmQgaXQKPiBzdGlsbCB3b3JrZWQuCgpzbyB0aGUgbGFzdCBj aHVuayBpcyBub3QgcmVsYXRlZCwgd2UgZG9uJ3QgaGF2ZSB0byB0b3VjaCBpdC4KClJlZ2FyZHMs Ci1CaW4uCg== 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=-9.4 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 5404EC43387 for ; Tue, 15 Jan 2019 16:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1449520657 for ; Tue, 15 Jan 2019 16:35:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="o/0g1DgH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731558AbfAOQfa (ORCPT ); Tue, 15 Jan 2019 11:35:30 -0500 Received: from fllv0015.ext.ti.com ([198.47.19.141]:53374 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728546AbfAOQf3 (ORCPT ); Tue, 15 Jan 2019 11:35:29 -0500 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x0FGZLY1106679; Tue, 15 Jan 2019 10:35:21 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1547570121; bh=gqeHyWL5agUxmC3J4fVjJR5h7s9zRpL970tJu+6C1gI=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=o/0g1DgHRb/PJ44gq6NbSvv0DDuDF6Ijx6xMaDPljccJugvdjnNu5ngkba3x5EOno HY8VGxmUFhaVl2DYCyE9+ioN2XJGp80E6VrBcLWqx8Os1ooKQzZWGc5XjjfmxNUEyt KvtjJXoj5j2/fB1CxSlcgiT+UcOW75ixaFGXlPFA= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x0FGZLXk100820 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 15 Jan 2019 10:35:21 -0600 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 15 Jan 2019 10:35:21 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Tue, 15 Jan 2019 10:35:20 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x0FGZKP0009057; Tue, 15 Jan 2019 10:35:20 -0600 Date: Tue, 15 Jan 2019 10:35:20 -0600 From: Bin Liu To: Paul Elder CC: , , , , , , Subject: Re: [PATCH v2] usb: gadget: musb: fix short isoc packets with inventra dma Message-ID: <20190115163520.GC18026@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> <20190109150215.GJ25910@uda0271908> <20190111053159.GA32268@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20190111053159.GA32268@localhost.localdomain> 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 Fri, Jan 11, 2019 at 12:31:59AM -0500, Paul Elder wrote: > Hi Bin, > > On Wed, Jan 09, 2019 at 09:02:15AM -0600, Bin Liu wrote: > > 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. > > Do you mean change compared to the last version of the patch, or this > last chunk of the diff? I meant that the chunk above seems not related to this webcam short packet test case, so am wondering if this change is not neccessary - musb_writew(epio, MUSB_TXCSR, MUSB_TXCSR_MODE - | MUSB_TXCSR_TXPKTRDY); + musb_writew(epio, MUSB_TXCSR, csr | MUSB_TXCSR_TXPKTRDY); > > I guess I did also remove the return when I removed the 'if > (musb_dma_inventra())' block that had the FLUSHFIFIO, but when I tested > it it still worked. In fact, I reverted this last diff chunk and it > still worked. so the last chunk is not related, we don't have to touch it. Regards, -Bin.