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.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT 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 1CA36C43387 for ; Tue, 15 Jan 2019 01:44:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA218205C9 for ; Tue, 15 Jan 2019 01:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727746AbfAOBoL (ORCPT ); Mon, 14 Jan 2019 20:44:11 -0500 Received: from Mailgw01.mediatek.com ([1.203.163.78]:30927 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726769AbfAOBoK (ORCPT ); Mon, 14 Jan 2019 20:44:10 -0500 X-UUID: 9688400387d94252bd3f98e8ce746956-20190115 X-UUID: 9688400387d94252bd3f98e8ce746956-20190115 Received: from mtkcas36.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 957536321; Tue, 15 Jan 2019 09:44:01 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 15 Jan 2019 09:43:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 15 Jan 2019 09:43:58 +0800 From: To: Bin Liu , Rob Herring CC: Greg Kroah-Hartman , Mark Rutland , Matthias Brugger , Alan Stern , , , , , , , Min Guo Subject: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface Date: Tue, 15 Jan 2019 09:43:45 +0800 Message-ID: <1547516626-5084-4-git-send-email-min.guo@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; + + 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; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface Date: Tue, 15 Jan 2019 09:43:45 +0800 Message-ID: <1547516626-5084-4-git-send-email-min.guo@mediatek.com> References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Bin Liu , Rob Herring Cc: Greg Kroah-Hartman , Mark Rutland , Matthias Brugger , 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, Min Guo List-Id: devicetree@vger.kernel.org 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; + + 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; -- 1.9.1 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: <1547516626-5084-4-git-send-email-min.guo@mediatek.com> Date: Tue, 15 Jan 2019 09:43:45 +0800 To: Bin Liu , Rob Herring Cc: Greg Kroah-Hartman , Mark Rutland , Matthias Brugger , 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, Min Guo List-ID: RnJvbTogTWluIEd1byA8bWluLmd1b0BtZWRpYXRlay5jb20+CgpBZGQgYSBjb21tb24gaW50ZXJm YWNlIGZvciBzZXQgZGF0YSB0b2dnbGUKClNpZ25lZC1vZmYtYnk6IE1pbiBHdW8gPG1pbi5ndW9A bWVkaWF0ZWsuY29tPgotLS0KIGRyaXZlcnMvdXNiL211c2IvbXVzYl9ob3N0LmMgfCAzNyArKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5z ZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvbXVz Yi9tdXNiX2hvc3QuYyBiL2RyaXZlcnMvdXNiL211c2IvbXVzYl9ob3N0LmMKaW5kZXggYjU5Y2U5 YS4uMTZkMGJhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvbXVzYi9tdXNiX2hvc3QuYworKysg Yi9kcml2ZXJzL3VzYi9tdXNiL211c2JfaG9zdC5jCkBAIC0zMDYsNiArMzA2LDI1IEBAIHN0YXRp YyBpbmxpbmUgdm9pZCBtdXNiX3NhdmVfdG9nZ2xlKHN0cnVjdCBtdXNiX3FoICpxaCwgaW50IGlz X2luLAogCXVzYl9zZXR0b2dnbGUodXJiLT5kZXYsIHFoLT5lcG51bSwgIWlzX2luLCBjc3IgPyAx IDogMCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdTE2IG11c2Jfc2V0X3RvZ2dsZShzdHJ1Y3QgbXVz Yl9xaCAqcWgsIGludCBpc19pbiwKKwlzdHJ1Y3QgdXJiICp1cmIpCit7CisJdTE2IGNzciA9IDA7 CisJdTE2IHRvZ2dsZSA9IDA7CisKKwl0b2dnbGUgPSB1c2JfZ2V0dG9nZ2xlKHVyYi0+ZGV2LCBx aC0+ZXBudW0sICFpc19pbik7CisKKwlpZiAoaXNfaW4pCisJCWNzciA9IHRvZ2dsZSA/IChNVVNC X1JYQ1NSX0hfV1JfREFUQVRPR0dMRQorCQkJCXwgTVVTQl9SWENTUl9IX0RBVEFUT0dHTEUpIDog MDsKKwllbHNlCisJCWNzciA9IHRvZ2dsZSA/IChNVVNCX1RYQ1NSX0hfV1JfREFUQVRPR0dMRQor CQkJCXwgTVVTQl9UWENTUl9IX0RBVEFUT0dHTEUpCisJCQkJOiBNVVNCX1RYQ1NSX0NMUkRBVEFU T0c7CisKKwlyZXR1cm4gY3NyOworfQorCiAvKgogICogQWR2YW5jZSB0aGlzIGhhcmR3YXJlIGVu ZHBvaW50J3MgcXVldWUsIGNvbXBsZXRpbmcgdGhlIHNwZWNpZmllZCBVUkIgYW5kCiAgKiBhZHZh bmNpbmcgdG8gZWl0aGVyIHRoZSBuZXh0IFVSQiBxdWV1ZWQgdG8gdGhhdCBxaCwgb3IgZWxzZSBp bnZhbGlkYXRpbmcKQEAgLTc3MiwxMyArNzkxLDggQEAgc3RhdGljIHZvaWQgbXVzYl9lcF9wcm9n cmFtKHN0cnVjdCBtdXNiICptdXNiLCB1OCBlcG51bSwKIAkJCQkJKTsKIAkJCWNzciB8PSBNVVNC X1RYQ1NSX01PREU7CiAKLQkJCWlmICghaHdfZXAtPnR4X2RvdWJsZV9idWZmZXJlZCkgewotCQkJ CWlmICh1c2JfZ2V0dG9nZ2xlKHVyYi0+ZGV2LCBxaC0+ZXBudW0sIDEpKQotCQkJCQljc3IgfD0g TVVTQl9UWENTUl9IX1dSX0RBVEFUT0dHTEUKLQkJCQkJCXwgTVVTQl9UWENTUl9IX0RBVEFUT0dH TEU7Ci0JCQkJZWxzZQotCQkJCQljc3IgfD0gTVVTQl9UWENTUl9DTFJEQVRBVE9HOwotCQkJfQor CQkJaWYgKCFod19lcC0+dHhfZG91YmxlX2J1ZmZlcmVkKQorCQkJCWNzciB8PSBtdXNiX3NldF90 b2dnbGUocWgsICFpc19vdXQsIHVyYik7CiAKIAkJCW11c2Jfd3JpdGV3KGVwaW8sIE1VU0JfVFhD U1IsIGNzcik7CiAJCQkvKiBSRVZJU0lUIG1heSBuZWVkIHRvIGNsZWFyIEZMVVNIRklGTyAuLi4g Ki8KQEAgLTg2MCwxNyArODc0LDEyIEBAIHN0YXRpYyB2b2lkIG11c2JfZXBfcHJvZ3JhbShzdHJ1 Y3QgbXVzYiAqbXVzYiwgdTggZXBudW0sCiAKIAkvKiBJTi9yZWNlaXZlICovCiAJfSBlbHNlIHsK LQkJdTE2CWNzcjsKKwkJdTE2IGNzciA9IDA7CiAKIAkJaWYgKGh3X2VwLT5yeF9yZWluaXQpIHsK IAkJCW11c2JfcnhfcmVpbml0KG11c2IsIHFoLCBlcG51bSk7CisJCQljc3IgfD0gbXVzYl9zZXRf dG9nZ2xlKHFoLCAhaXNfb3V0LCB1cmIpOwogCi0JCQkvKiBpbml0IG5ldyBzdGF0ZTogdG9nZ2xl IGFuZCBOWUVULCBtYXliZSBETUEgbGF0ZXIgKi8KLQkJCWlmICh1c2JfZ2V0dG9nZ2xlKHVyYi0+ ZGV2LCBxaC0+ZXBudW0sIDApKQotCQkJCWNzciA9IE1VU0JfUlhDU1JfSF9XUl9EQVRBVE9HR0xF Ci0JCQkJCXwgTVVTQl9SWENTUl9IX0RBVEFUT0dHTEU7Ci0JCQllbHNlCi0JCQkJY3NyID0gMDsK IAkJCWlmIChxaC0+dHlwZSA9PSBVU0JfRU5EUE9JTlRfWEZFUl9JTlQpCiAJCQkJY3NyIHw9IE1V U0JfUlhDU1JfRElTTllFVDsKIAo= 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=-10.0 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,USER_AGENT_GIT 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 40831C43387 for ; Tue, 15 Jan 2019 01:45:12 +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 10A72205C9 for ; Tue, 15 Jan 2019 01:45:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Eawv65Zi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10A72205C9 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: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4HtdAF/QWUfgcc4indZdlXnrynY35wWiISMJBDT8E/U=; b=Eawv65ZiN+oZJv dbMp6IuytyapK777R0jetImHDlsPd9QtWN4tWHWxkFyAcRdGqWJCFsZxxZj90zX4KxPdsKAVv+2ja hPPO5j97PMd5WoWihF2RGpSpMWNzNllmR/gVXKvcWosjlCg/uRuvchbpy1E9p6aQWMpcmsp7tHByj paKoQlzdLMFRhFOAxXf1KF5fxg6dMGZDSx2oVNHVzIPdX+yRehp528uk9xxzxIY211N+ofyA1ORGd mlQln5T+RW+4NExsZ94OqIt+dZfDAA28eSQe2EJXubQf7c4UUITs9II4aiPOElDyEPCms2MDWbgzP KRAr10ee/VvKex2N/13w==; 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 1gjDmt-0006SX-5s; Tue, 15 Jan 2019 01:45:07 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjDm2-0005T4-OA; Tue, 15 Jan 2019 01:44:19 +0000 X-UUID: f0806807b39844baa9cbfa0897f995b3-20190114 X-UUID: f0806807b39844baa9cbfa0897f995b3-20190114 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 842582238; Mon, 14 Jan 2019 17:44:03 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 14 Jan 2019 17:44:02 -0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 15 Jan 2019 09:43:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 15 Jan 2019 09:43:58 +0800 From: To: Bin Liu , Rob Herring Subject: [PATCH v2 3/4] usb: musb: Extract set toggle as a separate interface Date: Tue, 15 Jan 2019 09:43:45 +0800 Message-ID: <1547516626-5084-4-git-send-email-min.guo@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> References: <1547516626-5084-1-git-send-email-min.guo@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190114_174415_238175_64CDE1F6 X-CRM114-Status: GOOD ( 12.44 ) 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, Matthias Brugger , Alan Stern , Min Guo , chunfeng.yun@mediatek.com, linux-mediatek@lists.infradead.org, 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 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; + + 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; -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel