From patchwork Wed Dec 6 08:18:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 10095043 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E47F460210 for ; Wed, 6 Dec 2017 08:22:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D535129BFE for ; Wed, 6 Dec 2017 08:22:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C99B529C03; Wed, 6 Dec 2017 08:22:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=AXB_X_OUTLOOKPROT_ENVSDR, BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54DD729BFE for ; Wed, 6 Dec 2017 08:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176AbdLFIW5 (ORCPT ); Wed, 6 Dec 2017 03:22:57 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:39680 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753465AbdLFIWv (ORCPT ); Wed, 6 Dec 2017 03:22:51 -0500 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 06 Dec 2017 17:22:49 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 092F47B129; Wed, 6 Dec 2017 17:22:50 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.45,367,1508770800"; d="scan'208";a="264316016" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 06 Dec 2017 17:22:49 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IaqDNfYXagK2rrsQQmLkAnHhartjA4s+84pDVcusSk4=; b=FLNhLY3QMd52J4g2WS/euqL1c6WYYE6LH+2fX5H+avpasud2C6vfBlzq0TKjVNeqs5fQYMlI/1aCecihorpLdoyCgZ0ozchw4ulbSgaMF9epwcCZ6fJKH4wuTJOMIsTInR5IJy+jp3218eLaD2VHkBOELvf/n3AR1kQCBnrHo14= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost.localdomain (211.11.155.138) by SIXPR06MB0988.apcprd06.prod.outlook.com (2a01:111:e400:51e9::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Wed, 6 Dec 2017 08:22:46 +0000 From: Yoshihiro Shimoda To: balbi@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH 3/3] usb: renesas_usbhs: use PIPEnCLR.ACLRM instead of {C, Dn}FIFOCTR.BCLR in usbhs_pkt_pop() Date: Wed, 6 Dec 2017 17:18:33 +0900 Message-Id: <1512548313-20175-4-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512548313-20175-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1512548313-20175-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0003.jpnprd01.prod.outlook.com (2603:1096:402:19::13) To SIXPR06MB0988.apcprd06.prod.outlook.com (2a01:111:e400:51e9::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: acf781a7-e3b1-4bd0-073c-08d53c828870 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(48565401081)(2017052603286); SRVR:SIXPR06MB0988; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0988; 3:ptaV5vHR9QgqcIHRVsglDmXpPCObqjzMSrKFA4CDymwUBzH9ygtbAhvbI3YnyhTVkuWOnojwrUL3rSOptg6KnAdv27Ee2L9xJqaVrMC9MGVrwO/ep5K1rIA1PxWCFMfHqF/kbeLouu8pZysSrDB3Fii88b0NMK5XY/HqQsYyPEJ2FO1Zc5exJdU2T/u0AjLccheAEeaP9VGxE+0VusS8zkASSmnrjcn184/TllYoU03NJy40Kht7yQfVpqnjylPf; 25:atTb2L69+zG2TtFut4zr7VtODRzRadxmY44DA38dhSVMbhG0WC23uUnZyUOPhmjI1eICig8ZIMAAEYuu79k6ds2kiw7y3SZQJ3Xy01t4+M1b3gv0CFRA1A6dCnT4iLRNBTr1K+cbyY/PnEzA5QE3SU3ee0lnM5wB8WzXpP/AEMQRZAm22mjEUFg0mHJWYrlg4JgnP14qo0XiFA5JsmPn0pltCcieGp8EwzwX0cevK1jZwq51FLTSdgMFRLc0sOX+/tije/Ngxiiqrp9HzCxDFu7o0Kc41ZQKZvr9RzDJiFC93OdEDXk8skdMMOW/s/u3CM0cd1yW5z5aAyhWNCPTkA==; 31:G+HKc9/dmqV8MuDNtX8XvwwZJmRrM4K6QlgC1XuxZ7hOQiNFkFEay/z5azWq2pNX0ohP+a0Hx8D1/qaFZVhFpHDOlIxqqZ04bssGA38fGetOzXg33LbQhLBTS4SqHBKXXqm9PPawZtiAixfvwO4GRlJL0GPoMValZ5PySfBcReg+8WzRJDViFGjU+FPz0tKJcjz9Cb/Aueze1yqf3fEsNLMUUSlDH3Bj4J8GIhtte5c= X-MS-TrafficTypeDiagnostic: SIXPR06MB0988: X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0988; 20:Z6356V0ce2DFyTHgvvM4/GwFQuP8HtwIy3QPmi+vkS2WotSg2Eq77EpoZdisIW9jK6P4o6IW6UWG0FMPzSAfBWU9Lut+84jL9x4h6sWGRe7mar8CAsMq7PsZLlo3g4jL7qUrVDWMnWBD4AooVSEd3HI9dReeh8X9EskkdN8xC6/+13QdW1intWENW3TSEedQrBD5wZ0wDlY6iHpWZDj1zS8HSdW6BnhUMnKUa1ZKZRsxmaKqr8sEafvtg3NW7HuNfzOB+4XoIYc2vYEz8gWecfKtctfDn1TkcCplEv+Uas8fHJq8RCNKC3ZnPVGKDtMZREtje97t495AZMXYVN9OMhEv2kitSPkDebSuc8vmx605/HbjArYsvKYu5nNwxASC70lwG7PEPH0SFE27Gfsdq9fMbqCj9ejX67YU3mzu5e1EPIjk8Ax/VUwiemx6JrU5HE+sl2jZ4CLQeCUrFMqd/0m5zf69LKdRenNYsHlzPVD2ihYB9Pxc2lyBWQBnj46B; 4:EWE0EKR/dfAy0oyhgTBbR/iBavP/RSmHigdWRbFGHeXfjgss9TIA1ODgMCbYHhFHD+mOTB+1RqO9ZZEloBCwFtU+Z1O2c//4QKKPyZ5Rq3eZMLh/SMuX3Aj2qfaDRdT1p0ibBStqOtvr52UjHYllWV5BzvbQ0IdYTPW8P3f+gXUBxHftxDFLIe5CiZy9M0xumqq85Ik3nhJPNrVfMqOPk5ryMYwvABkGB5d0JhfjjWBfkY914Z1+z4vcKTGpWR/bSvaqyfXYA00Gt4PVtzEHKA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(10201501046)(3231022)(93006095)(3002001)(6055026)(6041248)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123555025)(6072148)(201708071742011); SRVR:SIXPR06MB0988; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SIXPR06MB0988; X-Forefront-PRVS: 05134F8B4F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(39860400002)(376002)(366004)(346002)(199004)(189003)(33646002)(36756003)(5660300001)(4326008)(97736004)(2361001)(2351001)(106356001)(105586002)(50466002)(48376002)(50226002)(6116002)(3846002)(68736007)(101416001)(6666003)(498600001)(8936002)(2950100002)(42882006)(6916009)(6486002)(316002)(16526018)(6512007)(52116002)(51416003)(6506006)(2906002)(53936002)(7736002)(78352004)(305945005)(16586007)(81166006)(107886003)(66066001)(47776003)(25786009)(8676002)(81156014)(76176011)(142933001)(3720700003); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0988; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:0; MX:0; LANG:en; Received-SPF: None (protection.outlook.com: localhost.localdomain does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0988; 23:BD4me/Zagt1CFN79Pi+QM5hL6V4es0uB9/Vo9FP2o?= =?us-ascii?Q?gMlvW19jkE7GbGZuwLHwJLFemnH2X1V/scTzAwG6olsDufKVfxGZJ5hFIVDV?= =?us-ascii?Q?zDcwX+t12Wu/QAyEWJiZp71KeRXluMDvzglSv9NB1ikL66o1O1FROiaALa2B?= =?us-ascii?Q?xdakDiYBJDOMDTVl8sRM5oz5cb6CjiqGj2DseUI3DFBD3zDEZkUcAmrmQlCW?= =?us-ascii?Q?VeVFGZHIGAucCxCasfTp5CdoFJckJMUxpoh+dQ8FRe8i1LKmhOAyHcWltyyn?= =?us-ascii?Q?oqWpTMk5ZWMhF3q+pjLyjbpMlOcINIxDREV+MzluAYBpwTf3tW5WUHNNV467?= =?us-ascii?Q?CnROBuD8w4X8fNt1HMwRrA4255I3ikMnIw7MRMW4L21y30hTar06wxJdc7Vm?= =?us-ascii?Q?8lT8c3yuc52NA2zyaH+Sa/3cfgOoLWg1AlgJEQO8pG0TvtcFhZ1iYuWdvlak?= =?us-ascii?Q?XZsJSzfzyRhcMxt3V4hIxo0FI7VXS3HfzQ2t/oFKDgH6AgbRDG+Au0p3m122?= =?us-ascii?Q?ufdxDITN2+bHovBxaJSjhS2My6r1Mor0YS1yX+q+u10LunhPmAV4+0gVeMej?= =?us-ascii?Q?BvVxDmoOWmp9CaSF8hiSF8DlyeIcDFOau+X3aqSMsaKXVBH375lSl657V5zJ?= =?us-ascii?Q?VfWydEqalnBMd4laHOThNk/39WdoZUHszaW1quqaeXVx5MLzHFx7Z8UvkV4T?= =?us-ascii?Q?nz3IWir5Vt1XD8Y8hif3UPb3fhjx+en6EhL391gpLeDFZ9SmYP8FwTJf+gg3?= =?us-ascii?Q?O8/E59/JheQbeYGIur6SjLNh/1uINEczfMzIvhL0pydLtt2K6Pm8jQtSL2qj?= =?us-ascii?Q?nKm55pg2eb/CoMesga4oS93aGZOg2Wl29CUu29/ZcQTgyNVTn4O3DGSyEA6J?= =?us-ascii?Q?DKBu1zdxSR/Yp6LTM2j98y2VMDclwjYEkEkt7flMOhdEpVgvg0HjnWO3HEh9?= =?us-ascii?Q?aFXnFYtrifd5WRYObzKygsEbJHsPqKqGHLaudsQ6GUVh3q2Ks3yWsYU5OFH9?= =?us-ascii?Q?2FKK2fM4dHFrJl4VEDWr4W42rjLiucd5em17LO8gvh9OkFXpi6OCIek7q/yT?= =?us-ascii?Q?1hvAzz7vNE4J0NVgKVBFYemp5p9AmCEVxcxmIlMUCpHgEwcFusuyO62NKoR/?= =?us-ascii?Q?0KLdSBtowe/YA/xVHaBIUADJJiY+6cRVpo48XSdiXEL+albay5Cc9L70NWml?= =?us-ascii?Q?MHsDRgRq/ASryKH8Qahj/9hxhN2yYzpYzeB?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0988; 6:eKq8jrOf59ec8BV2aNY43OVGUrcizU82xpLf4XLe1hcgLgLWylYI7sQ48zxempYwAJWuEr8501mUwPe4es1wKxnsK0LetHZ+xVo0Q5n99yizKat6nH/9fg11T5EC3b/5T8PVEOkWrtmyoDEZZwMhmuwsNCh7SsxCFnHj1ClS5ThtrMlIUWND+KqcmBPegmhaQsHUypWALb7g0v06t7LRWzqk8PBOdhskUKa/bUwURC0g8CW0OKHhbIleExC2VRNClvo5H9uYDDId7u0mKD7Mf4oTibNOYMD9hiRn3nWUWp8LRZqEkiqYseNJpSnhqWY1ogGCFAilRZF3D88meGk0cdQRcb7c5+d0bAPhnqksShs=; 5:xeLd8FKYQUXYwdGIebSm4DDKgrg/V58PVHYv5srQqauiNMVOk3DMJ4rDgFcvVlhVS7xe7tHk6Gt9n3UUnrRMQwhubfGFwrP4Sd+Z+6kKNP5NNlRqvd6pDh0bI5cx0JqguyKfMWvaFj724oDA8hugDUHTCRtGqUVLREYegVkO5RQ=; 24:Q0pmQRB/v9dEuuydlevcA4U8DjmqfdkcPnHxiY5n9HeQGyRHbSvq2gQT4YfYeGBbR/P8M2g4uuWmcLGylAeSFlW3oHCk/T6eqrFfupySqq0=; 7:iRb9gSL8V73RnYCgpfwW/M2DykpYOB9D2pDgbBlMOT4ZUwZnOGS7rxRsZCmwv0vezHy+LRpHEFt+BhNsr/FFiXtxLoBYT/993A9TOekZ/WqqWzwPoycVJMo+demKLgnLk9d9aVQaWVQMDKQDDgWIRVPOOxM975kqxttQhFkl7w03M1OyyoFKZOgamrZ0O8lAW+XLciuHHdLmx++KG9X1OyscA12mETaEiXPqhPEhm6RTpdIhymNwiu8ZEde0H72T SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0988; 20:cGfbdfNSKjACJSYVRN0EHDCmZphSlf+9bDbSHMxHETVRzKR3T/goieGw8Tge3ixnDh8J8WAtSiqfsUK9D8EobMEOF9ErFGE4jaTXZAHoBFpLBqIXRP2TbYG4Mk3zjb1QY5anHUf5lnC0ZumnNjywEfQwD2Jee8a+OfrkFdfw6No= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2017 08:22:46.9469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: acf781a7-e3b1-4bd0-073c-08d53c828870 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0988 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch uses usbhs_pipe_clear_without_sequence() instead of usbhsf_fifo_clear() because usbhsf_fifo_clear() may not clear the pipe buffer completely. This patch also changes the clearing condition from DMA only to both DMA and PIO. Signed-off-by: Yoshihiro Shimoda --- drivers/usb/renesas_usbhs/fifo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index ff96c2e..5925d11 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -94,8 +94,6 @@ static struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe) return list_first_entry_or_null(&pipe->list, struct usbhs_pkt, node); } -static void usbhsf_fifo_clear(struct usbhs_pipe *pipe, - struct usbhs_fifo *fifo); static void usbhsf_fifo_unselect(struct usbhs_pipe *pipe, struct usbhs_fifo *fifo); static struct dma_chan *usbhsf_dma_chan_get(struct usbhs_fifo *fifo, @@ -124,10 +122,11 @@ struct usbhs_pkt *usbhs_pkt_pop(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt) chan = usbhsf_dma_chan_get(fifo, pkt); if (chan) { dmaengine_terminate_all(chan); - usbhsf_fifo_clear(pipe, fifo); usbhsf_dma_unmap(pkt); } + usbhs_pipe_clear_without_sequence(pipe, 0, 0); + __usbhsf_pkt_del(pkt); }