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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED 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 3915BC43387 for ; Wed, 16 Jan 2019 02:44:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 131412082F for ; Wed, 16 Jan 2019 02:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729419AbfAPCoQ (ORCPT ); Tue, 15 Jan 2019 21:44:16 -0500 Received: from Mailgw01.mediatek.com ([1.203.163.78]:33985 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728309AbfAPCoP (ORCPT ); Tue, 15 Jan 2019 21:44:15 -0500 X-UUID: af8c322969e444708d0ffa7c17f045fa-20190116 X-UUID: af8c322969e444708d0ffa7c17f045fa-20190116 Received: from mtkcas35.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 68905317; Wed, 16 Jan 2019 10:44:09 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 16 Jan 2019 10:44:08 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 16 Jan 2019 10:44:07 +0800 Message-ID: <1547606647.4433.180.camel@mhfsdcap03> Subject: Re: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface From: Min Guo To: Matthias Brugger CC: Bin Liu , Rob Herring , "Greg Kroah-Hartman" , Mark Rutland , Alan Stern , , , , , , Date: Wed, 16 Jan 2019 10:44:07 +0800 In-Reply-To: References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> <1547516626-5084-4-git-send-email-min.guo@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Matthias, On Tue, 2019-01-15 at 16:19 +0100, Matthias Brugger wrote: > > On 15/01/2019 02:43, min.guo@mediatek.com wrote: > > From: Min Guo > > > > Add a common interface for set data toggle > > > > Signed-off-by: Min Guo > > --- > > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++-------------- > > 1 file changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c > > index b59ce9a..16d0ba4 100644 > > --- a/drivers/usb/musb/musb_host.c > > +++ b/drivers/usb/musb/musb_host.c > > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in, > > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0); > > } > > > > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in, > > + struct urb *urb) > > +{ > > + u16 csr = 0; > > + u16 toggle = 0; > > + > > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in); > > + > > + if (is_in) > > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE > > + | MUSB_RXCSR_H_DATATOGGLE) : 0; > > + else > > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE > > + | MUSB_TXCSR_H_DATATOGGLE) > > + : MUSB_TXCSR_CLRDATATOG; > > Can we switch the if and use is_out logic as function parameter. This would make > the code easier to understand. Okay. > Regards, > Matthias > > > + > > + return csr; > > +} > > + > > /* > > * Advance this hardware endpoint's queue, completing the specified URB and > > * advancing to either the next URB queued to that qh, or else invalidating > > @@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > ); > > csr |= MUSB_TXCSR_MODE; > > > > - if (!hw_ep->tx_double_buffered) { > > - if (usb_gettoggle(urb->dev, qh->epnum, 1)) > > - csr |= MUSB_TXCSR_H_WR_DATATOGGLE > > - | MUSB_TXCSR_H_DATATOGGLE; > > - else > > - csr |= MUSB_TXCSR_CLRDATATOG; > > - } > > + if (!hw_ep->tx_double_buffered) > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > musb_writew(epio, MUSB_TXCSR, csr); > > /* REVISIT may need to clear FLUSHFIFO ... */ > > @@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > > > /* IN/receive */ > > } else { > > - u16 csr; > > + u16 csr = 0; > > > > if (hw_ep->rx_reinit) { > > musb_rx_reinit(musb, qh, epnum); > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > - /* init new state: toggle and NYET, maybe DMA later */ > > - if (usb_gettoggle(urb->dev, qh->epnum, 0)) > > - csr = MUSB_RXCSR_H_WR_DATATOGGLE > > - | MUSB_RXCSR_H_DATATOGGLE; > > - else > > - csr = 0; > > if (qh->type == USB_ENDPOINT_XFER_INT) > > csr |= MUSB_RXCSR_DISNYET; > > > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Min Guo Subject: Re: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface Date: Wed, 16 Jan 2019 10:44:07 +0800 Message-ID: <1547606647.4433.180.camel@mhfsdcap03> References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> <1547516626-5084-4-git-send-email-min.guo@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Matthias Brugger Cc: Bin Liu , Rob Herring , Greg Kroah-Hartman , Mark Rutland , Alan Stern , chunfeng.yun@mediatek.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org List-Id: devicetree@vger.kernel.org Hi Matthias, On Tue, 2019-01-15 at 16:19 +0100, Matthias Brugger wrote: > > On 15/01/2019 02:43, min.guo@mediatek.com wrote: > > From: Min Guo > > > > Add a common interface for set data toggle > > > > Signed-off-by: Min Guo > > --- > > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++-------------- > > 1 file changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c > > index b59ce9a..16d0ba4 100644 > > --- a/drivers/usb/musb/musb_host.c > > +++ b/drivers/usb/musb/musb_host.c > > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in, > > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0); > > } > > > > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in, > > + struct urb *urb) > > +{ > > + u16 csr = 0; > > + u16 toggle = 0; > > + > > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in); > > + > > + if (is_in) > > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE > > + | MUSB_RXCSR_H_DATATOGGLE) : 0; > > + else > > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE > > + | MUSB_TXCSR_H_DATATOGGLE) > > + : MUSB_TXCSR_CLRDATATOG; > > Can we switch the if and use is_out logic as function parameter. This would make > the code easier to understand. Okay. > Regards, > Matthias > > > + > > + return csr; > > +} > > + > > /* > > * Advance this hardware endpoint's queue, completing the specified URB and > > * advancing to either the next URB queued to that qh, or else invalidating > > @@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > ); > > csr |= MUSB_TXCSR_MODE; > > > > - if (!hw_ep->tx_double_buffered) { > > - if (usb_gettoggle(urb->dev, qh->epnum, 1)) > > - csr |= MUSB_TXCSR_H_WR_DATATOGGLE > > - | MUSB_TXCSR_H_DATATOGGLE; > > - else > > - csr |= MUSB_TXCSR_CLRDATATOG; > > - } > > + if (!hw_ep->tx_double_buffered) > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > musb_writew(epio, MUSB_TXCSR, csr); > > /* REVISIT may need to clear FLUSHFIFO ... */ > > @@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > > > /* IN/receive */ > > } else { > > - u16 csr; > > + u16 csr = 0; > > > > if (hw_ep->rx_reinit) { > > musb_rx_reinit(musb, qh, epnum); > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > - /* init new state: toggle and NYET, maybe DMA later */ > > - if (usb_gettoggle(urb->dev, qh->epnum, 0)) > > - csr = MUSB_RXCSR_H_WR_DATATOGGLE > > - | MUSB_RXCSR_H_DATATOGGLE; > > - else > > - csr = 0; > > if (qh->type == USB_ENDPOINT_XFER_INT) > > csr |= MUSB_RXCSR_DISNYET; > > > > 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,3/4] usb: musb: Extract set toggle as a separate interface From: min.guo@mediatek.com Message-Id: <1547606647.4433.180.camel@mhfsdcap03> Date: Wed, 16 Jan 2019 10:44:07 +0800 To: Matthias Brugger Cc: Bin Liu , Rob Herring , Greg Kroah-Hartman , Mark Rutland , Alan Stern , chunfeng.yun@mediatek.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org List-ID: SGkgTWF0dGhpYXMsCgpPbiBUdWUsIDIwMTktMDEtMTUgYXQgMTY6MTkgKzAxMDAsIE1hdHRoaWFz IEJydWdnZXIgd3JvdGU6Cj4gCj4gT24gMTUvMDEvMjAxOSAwMjo0MywgbWluLmd1b0BtZWRpYXRl ay5jb20gd3JvdGU6Cj4gPiBGcm9tOiBNaW4gR3VvIDxtaW4uZ3VvQG1lZGlhdGVrLmNvbT4KPiA+ IAo+ID4gQWRkIGEgY29tbW9uIGludGVyZmFjZSBmb3Igc2V0IGRhdGEgdG9nZ2xlCj4gPiAKPiA+ IFNpZ25lZC1vZmYtYnk6IE1pbiBHdW8gPG1pbi5ndW9AbWVkaWF0ZWsuY29tPgo+ID4gLS0tCj4g PiAgZHJpdmVycy91c2IvbXVzYi9tdXNiX2hvc3QuYyB8IDM3ICsrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwg MTQgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9tdXNiL211 c2JfaG9zdC5jIGIvZHJpdmVycy91c2IvbXVzYi9tdXNiX2hvc3QuYwo+ID4gaW5kZXggYjU5Y2U5 YS4uMTZkMGJhNCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvdXNiL211c2IvbXVzYl9ob3N0LmMK PiA+ICsrKyBiL2RyaXZlcnMvdXNiL211c2IvbXVzYl9ob3N0LmMKPiA+IEBAIC0zMDYsNiArMzA2 LDI1IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBtdXNiX3NhdmVfdG9nZ2xlKHN0cnVjdCBtdXNiX3Fo ICpxaCwgaW50IGlzX2luLAo+ID4gIAl1c2Jfc2V0dG9nZ2xlKHVyYi0+ZGV2LCBxaC0+ZXBudW0s ICFpc19pbiwgY3NyID8gMSA6IDApOwo+ID4gIH0KPiA+ICAKPiA+ICtzdGF0aWMgaW5saW5lIHUx NiBtdXNiX3NldF90b2dnbGUoc3RydWN0IG11c2JfcWggKnFoLCBpbnQgaXNfaW4sCj4gPiArCXN0 cnVjdCB1cmIgKnVyYikKPiA+ICt7Cj4gPiArCXUxNiBjc3IgPSAwOwo+ID4gKwl1MTYgdG9nZ2xl ID0gMDsKPiA+ICsKPiA+ICsJdG9nZ2xlID0gdXNiX2dldHRvZ2dsZSh1cmItPmRldiwgcWgtPmVw bnVtLCAhaXNfaW4pOwo+ID4gKwo+ID4gKwlpZiAoaXNfaW4pCj4gPiArCQljc3IgPSB0b2dnbGUg PyAoTVVTQl9SWENTUl9IX1dSX0RBVEFUT0dHTEUKPiA+ICsJCQkJfCBNVVNCX1JYQ1NSX0hfREFU QVRPR0dMRSkgOiAwOwo+ID4gKwllbHNlCj4gPiArCQljc3IgPSB0b2dnbGUgPyAoTVVTQl9UWENT Ul9IX1dSX0RBVEFUT0dHTEUKPiA+ICsJCQkJfCBNVVNCX1RYQ1NSX0hfREFUQVRPR0dMRSkKPiA+ ICsJCQkJOiBNVVNCX1RYQ1NSX0NMUkRBVEFUT0c7Cj4gCj4gQ2FuIHdlIHN3aXRjaCB0aGUgaWYg YW5kIHVzZSBpc19vdXQgbG9naWMgYXMgZnVuY3Rpb24gcGFyYW1ldGVyLiBUaGlzIHdvdWxkIG1h a2UKPiB0aGUgY29kZSBlYXNpZXIgdG8gdW5kZXJzdGFuZC4KCk9rYXkuCgo+IFJlZ2FyZHMsCj4g TWF0dGhpYXMKPiAKPiA+ICsKPiA+ICsJcmV0dXJuIGNzcjsKPiA+ICt9Cj4gPiArCj4gPiAgLyoK PiA+ICAgKiBBZHZhbmNlIHRoaXMgaGFyZHdhcmUgZW5kcG9pbnQncyBxdWV1ZSwgY29tcGxldGlu ZyB0aGUgc3BlY2lmaWVkIFVSQiBhbmQKPiA+ICAgKiBhZHZhbmNpbmcgdG8gZWl0aGVyIHRoZSBu ZXh0IFVSQiBxdWV1ZWQgdG8gdGhhdCBxaCwgb3IgZWxzZSBpbnZhbGlkYXRpbmcKPiA+IEBAIC03 NzIsMTMgKzc5MSw4IEBAIHN0YXRpYyB2b2lkIG11c2JfZXBfcHJvZ3JhbShzdHJ1Y3QgbXVzYiAq bXVzYiwgdTggZXBudW0sCj4gPiAgCQkJCQkpOwo+ID4gIAkJCWNzciB8PSBNVVNCX1RYQ1NSX01P REU7Cj4gPiAgCj4gPiAtCQkJaWYgKCFod19lcC0+dHhfZG91YmxlX2J1ZmZlcmVkKSB7Cj4gPiAt CQkJCWlmICh1c2JfZ2V0dG9nZ2xlKHVyYi0+ZGV2LCBxaC0+ZXBudW0sIDEpKQo+ID4gLQkJCQkJ Y3NyIHw9IE1VU0JfVFhDU1JfSF9XUl9EQVRBVE9HR0xFCj4gPiAtCQkJCQkJfCBNVVNCX1RYQ1NS X0hfREFUQVRPR0dMRTsKPiA+IC0JCQkJZWxzZQo+ID4gLQkJCQkJY3NyIHw9IE1VU0JfVFhDU1Jf Q0xSREFUQVRPRzsKPiA+IC0JCQl9Cj4gPiArCQkJaWYgKCFod19lcC0+dHhfZG91YmxlX2J1ZmZl cmVkKQo+ID4gKwkJCQljc3IgfD0gbXVzYl9zZXRfdG9nZ2xlKHFoLCAhaXNfb3V0LCB1cmIpOwo+ ID4gIAo+ID4gIAkJCW11c2Jfd3JpdGV3KGVwaW8sIE1VU0JfVFhDU1IsIGNzcik7Cj4gPiAgCQkJ LyogUkVWSVNJVCBtYXkgbmVlZCB0byBjbGVhciBGTFVTSEZJRk8gLi4uICovCj4gPiBAQCAtODYw LDE3ICs4NzQsMTIgQEAgc3RhdGljIHZvaWQgbXVzYl9lcF9wcm9ncmFtKHN0cnVjdCBtdXNiICpt dXNiLCB1OCBlcG51bSwKPiA+ICAKPiA+ICAJLyogSU4vcmVjZWl2ZSAqLwo+ID4gIAl9IGVsc2Ug ewo+ID4gLQkJdTE2CWNzcjsKPiA+ICsJCXUxNiBjc3IgPSAwOwo+ID4gIAo+ID4gIAkJaWYgKGh3 X2VwLT5yeF9yZWluaXQpIHsKPiA+ICAJCQltdXNiX3J4X3JlaW5pdChtdXNiLCBxaCwgZXBudW0p Owo+ID4gKwkJCWNzciB8PSBtdXNiX3NldF90b2dnbGUocWgsICFpc19vdXQsIHVyYik7Cj4gPiAg Cj4gPiAtCQkJLyogaW5pdCBuZXcgc3RhdGU6IHRvZ2dsZSBhbmQgTllFVCwgbWF5YmUgRE1BIGxh dGVyICovCj4gPiAtCQkJaWYgKHVzYl9nZXR0b2dnbGUodXJiLT5kZXYsIHFoLT5lcG51bSwgMCkp Cj4gPiAtCQkJCWNzciA9IE1VU0JfUlhDU1JfSF9XUl9EQVRBVE9HR0xFCj4gPiAtCQkJCQl8IE1V U0JfUlhDU1JfSF9EQVRBVE9HR0xFOwo+ID4gLQkJCWVsc2UKPiA+IC0JCQkJY3NyID0gMDsKPiA+ ICAJCQlpZiAocWgtPnR5cGUgPT0gVVNCX0VORFBPSU5UX1hGRVJfSU5UKQo+ID4gIAkJCQljc3Ig fD0gTVVTQl9SWENTUl9ESVNOWUVUOwo+ID4gIAo+ID4K 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=-7.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable 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 7CF6FC43387 for ; Wed, 16 Jan 2019 02:44:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 470C12082F for ; Wed, 16 Jan 2019 02:44:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="F4+CF9aL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 470C12082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gInNuEKqObG/jlpGt/3hmWeKjYCVqpM7nmrCMwBKf70=; b=F4+CF9aLB/kcgB B6JFWPiFvLlvg8bmmnE2nVql/YChLFilgPisev9UUIVpIGMPidt2WDmSwSR9sneIr4q9pA+rfgTfW murVXEzd4vTbfDQA38osLmZKTF2E0o04Zg3Iwb51l2lMlTGoJuBQnebluBTMyCI2W0+vgR+cVVV6f Lq5LBXm3qQJ4YEsPskDwNg9bcmHTBAIONBAKL9nnT/xjmXx4K9fD1Ia4wmxa9PdLOGv0C5xj+U0DW dHClGuTCAtJW2I4oxw83TKiDbyM7uwcoN0LC7DGIeNbz1GW9c+ecR1zRVuPRsIM+kPHt9pJITqrPc XbF/aJNYF9TdjyIoggPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjbC1-0006zv-KS; Wed, 16 Jan 2019 02:44:37 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjbBx-0006z9-Gl; Wed, 16 Jan 2019 02:44:34 +0000 X-UUID: 1d1b9d4e68864c4da951b204885da679-20190115 X-UUID: 1d1b9d4e68864c4da951b204885da679-20190115 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2024046004; Tue, 15 Jan 2019 18:44:12 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 15 Jan 2019 18:44:10 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 16 Jan 2019 10:44:08 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 16 Jan 2019 10:44:07 +0800 Message-ID: <1547606647.4433.180.camel@mhfsdcap03> Subject: Re: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface From: Min Guo To: Matthias Brugger Date: Wed, 16 Jan 2019 10:44:07 +0800 In-Reply-To: References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> <1547516626-5084-4-git-send-email-min.guo@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190115_184433_559231_18461382 X-CRM114-Status: GOOD ( 19.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Alan Stern , chunfeng.yun@mediatek.com, linux-mediatek@lists.infradead.org, Bin Liu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Matthias, On Tue, 2019-01-15 at 16:19 +0100, Matthias Brugger wrote: > > On 15/01/2019 02:43, min.guo@mediatek.com wrote: > > From: Min Guo > > > > Add a common interface for set data toggle > > > > Signed-off-by: Min Guo > > --- > > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++-------------- > > 1 file changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c > > index b59ce9a..16d0ba4 100644 > > --- a/drivers/usb/musb/musb_host.c > > +++ b/drivers/usb/musb/musb_host.c > > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in, > > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0); > > } > > > > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in, > > + struct urb *urb) > > +{ > > + u16 csr = 0; > > + u16 toggle = 0; > > + > > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in); > > + > > + if (is_in) > > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE > > + | MUSB_RXCSR_H_DATATOGGLE) : 0; > > + else > > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE > > + | MUSB_TXCSR_H_DATATOGGLE) > > + : MUSB_TXCSR_CLRDATATOG; > > Can we switch the if and use is_out logic as function parameter. This would make > the code easier to understand. Okay. > Regards, > Matthias > > > + > > + return csr; > > +} > > + > > /* > > * Advance this hardware endpoint's queue, completing the specified URB and > > * advancing to either the next URB queued to that qh, or else invalidating > > @@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > ); > > csr |= MUSB_TXCSR_MODE; > > > > - if (!hw_ep->tx_double_buffered) { > > - if (usb_gettoggle(urb->dev, qh->epnum, 1)) > > - csr |= MUSB_TXCSR_H_WR_DATATOGGLE > > - | MUSB_TXCSR_H_DATATOGGLE; > > - else > > - csr |= MUSB_TXCSR_CLRDATATOG; > > - } > > + if (!hw_ep->tx_double_buffered) > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > musb_writew(epio, MUSB_TXCSR, csr); > > /* REVISIT may need to clear FLUSHFIFO ... */ > > @@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum, > > > > /* IN/receive */ > > } else { > > - u16 csr; > > + u16 csr = 0; > > > > if (hw_ep->rx_reinit) { > > musb_rx_reinit(musb, qh, epnum); > > + csr |= musb_set_toggle(qh, !is_out, urb); > > > > - /* init new state: toggle and NYET, maybe DMA later */ > > - if (usb_gettoggle(urb->dev, qh->epnum, 0)) > > - csr = MUSB_RXCSR_H_WR_DATATOGGLE > > - | MUSB_RXCSR_H_DATATOGGLE; > > - else > > - csr = 0; > > if (qh->type == USB_ENDPOINT_XFER_INT) > > csr |= MUSB_RXCSR_DISNYET; > > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel