From patchwork Wed Sep 27 08:04:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 9973375 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 0628160375 for ; Wed, 27 Sep 2017 08:08:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECE6B28554 for ; Wed, 27 Sep 2017 08:08:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1A4A29109; Wed, 27 Sep 2017 08:08:08 +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=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 ED06228554 for ; Wed, 27 Sep 2017 08:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751887AbdI0IIG (ORCPT ); Wed, 27 Sep 2017 04:08:06 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:26385 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751362AbdI0IH7 (ORCPT ); Wed, 27 Sep 2017 04:07:59 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 27 Sep 2017 17:07:57 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 0903276FD6; Wed, 27 Sep 2017 17:07:57 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.42,444,1500908400"; d="scan'208";a="257864793" Received: from mail-ty1jpn01lp0183.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.183]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 27 Sep 2017 17:07:56 +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=q4JyYq6U5Y5ULwGLHXq594mXr95PRccaA5TzA60jfOs=; b=Uz1KGlN0tXtv2FqLc4wzHpS+kNUpUggA3rwlCzfHY7U/9ipsMK43/+fMhQeEoc0keFx+Jf/a1HApANlVQKTNLWdRv0XJ0rU5vpBuGEhWBOeShD0B2bxmClpOPvnis6uRr5K6U2gDVt7wssj6Awed/kB9rqCMw5yE3sV7rh/JLyg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost.localdomain (211.11.155.138) by TY1PR06MB0991.apcprd06.prod.outlook.com (10.164.99.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 27 Sep 2017 08:07:52 +0000 From: Yoshihiro Shimoda To: balbi@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, stable@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH] usb: renesas_usbhs: fix usbhsf_fifo_clear() behavior Date: Wed, 27 Sep 2017 17:04:05 +0900 Message-Id: <1506499445-14826-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: SG2PR0401CA0006.apcprd04.prod.outlook.com (10.170.128.144) To TY1PR06MB0991.apcprd06.prod.outlook.com (10.164.99.25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 366d382d-9907-4053-b867-08d5057edaff X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081); SRVR:TY1PR06MB0991; X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0991; 3:K6WUls1b9NPDi4HhXQplPuiQbemgm4LGyKE84LAqg1NztHX3AkGYeS49rxgBOR5jNmpMRYDF/+AQEph1bCuWJ4zi1NGIF5qzjI92z/SxNcLlsn6tTnt6Uu5yuUVlir0/g2v1SEYHgAxJcbZjdrwI/cTr/7RBSXU6C7ScSLOhNnC+VHt6dn38m068jkw/pQZNRLzwQKDdS1P1uCTz60C4eE5P2hUmKpjhvubXqn8GkdBZ1+BG9nkM783tkxZXtXMm; 25:A8iVsKeV4JDd9+ofVECOb5LeeHSvPCj63YoOOl/pS54OCZkLtNJULgWbGJIX2MmO1UNYZM4iFFEE/O52uJaBxBhf5Hh76ivWHS+vdwVQWyrWsNyCHCMhjXYzgaantUgN7Rx47m0ddOIPXFv1G0pmFbk8QGE3ACesbvr2tUBhWbzTuepMPO+caNQg1/WVn8p8E43U+V1QZQM/4s6NECNpW/ASn8vQhQZ+ipz1BjdZfSOA8rp/5dN8EjxxTgk8dgf8ZDjMrMOvuJbwXPZKUAxZ7nckZikMSZ3UQhqydwLLkj4ufXs4W2LhTrIYvD8wBWtut4Dpw4S75cpXkdmcNaIbdw==; 31:EHOUXLlnZ6AzO4oeYO0lg2lgxlBCJ8uG7wfeg2GlcgtvfvOE0zdk0xUrxfOFE2q4xFcJCR84wfGaznqq8RrVKUWbVXwPvAbzVH2N963n+uvdc9xKTtQSIkL4ePisNYI1sN2jE1+b9Dx3tSVQeXbTODBMHeoYSfhCmedn61QcSby4L2irEEl/6Jv+5eQt/Qrd9C2rNLaTpsYRotKrUtvEF3NFpg33i42Xw8usY0IXSj4= X-MS-TrafficTypeDiagnostic: TY1PR06MB0991: X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0991; 20:IIzWv5aPTRyq3NV873FwDMAy4JppXVsOim79r1nHH/zYNAJ9hj9Hfr+O/oApkD4Pv5HK9KwK4+qwVRNH/Q8KZVJDDcQlKRZO2r2DApYiucubnM/BbgBpalnCx9zl2vJVYpOkxd4UocdEhShf6sSAKyLCwXTDNOz5ioI2M1mrggixX4pNt37Ys/SxQoGODGNfcQ+hfJrJM+rkIVZbj4ik3oPKCIqamWFLRupba1haFbyKRgdcRHZ9iqc6KxWDxO1Z8swqGl2F6xAnoKDlDqX27leEyXBMFy3YzTrEqaSXjuz2x0ne0p0eoy2MuekCYS89uN0NtpRpE14pGmpgVR5vzYyS5R8FBUYBHGgKg7MGyfrZXOoL6kOrGOaJBxOzg3ImNzcJhHIB8dqLGr3O8kXAhWHVapgtBk/PNP3Yh2rsT3NGPQy7G1vpWQF9KvDQDVYzxzH1+TlgEvMR3+i/C9MOeGGUZGRc2x4vUwHm9Iaza9kTb0zEsxiGVUtpNdEB6mOU; 4:wySGKbbfadGWDZd74Su1bvvqhb+pGMjTm48ImIKbuj3cFLhH0NDJI/MxAcoByr7mZmw5puZyGcHHxmwLtX6cEZBFIzI04DcOQHVodsg/1t7vqZ4vjv7Hdui/sP5CM2nrI3YfUrL1Us2Gt3aHbUPC4KKcKd50TfEE09GeEEfAffs2TS4ikUmb8ITYjnZ2Xf4/ZY5LjvbgKGy204c5IbSmfWtPX6X/gk2VXJ8yQB0lFf1S9vSJjVIZj1gWGiEw8aqlghSTFmsn3W6oaMwhoeoSw24B4OiFZRh7jKX7RHn0h6Y= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:TY1PR06MB0991; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:TY1PR06MB0991; X-Forefront-PRVS: 04433051BF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(6009001)(376002)(346002)(39860400002)(199003)(189002)(498600001)(97736004)(8936002)(5660300001)(6916009)(6512007)(6486002)(7736002)(305945005)(68736007)(105586002)(6666003)(189998001)(16526017)(316002)(50466002)(33646002)(101416001)(2361001)(81166006)(53936002)(48376002)(8676002)(50226002)(4326008)(2351001)(42882006)(50986999)(81156014)(5003940100001)(16586007)(66066001)(106356001)(3846002)(6116002)(78352004)(6506006)(36756003)(25786009)(47776003)(107886003)(2906002)(3720700003); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR06MB0991; 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; TY1PR06MB0991; 23:IXG69Z+LL3mUYz3lweF8CHbmdPyWBi3teEHM+Isut?= =?us-ascii?Q?f/vhEQA/b08PSsCBo1XR6oTHtPXdNSE6MU9bNX+KX5o5k6vWPcc2Exqesht9?= =?us-ascii?Q?WVpFI88pr373w3+b/Ivr069Pl21LY4XjbHS8AwrMEX4rqKm9zovNGzthg3ag?= =?us-ascii?Q?k6GxZxnmYKPBoy4KQP324EpIFYLUMEu/wLU7jhvUSphgUewWUUmj/sfga2E3?= =?us-ascii?Q?FEkN815pCU87mTo59MNlph5zo42k5OoATXiN/RSV+Bt+9BS6mhfktbqgVgVL?= =?us-ascii?Q?2o2r+UJEGgIqZkY+p3PoTr+7li6r/oi5sQ7NEoYl6aG9rDSmUeJLuibGaGPq?= =?us-ascii?Q?dHScdHFUy0ZeqCtxm0lFdYSJJw1qmO/Ivd5757LZNBXjTpRVbQbHvsThzxHQ?= =?us-ascii?Q?mFoug0rE57uVHcIi0TXLCBdVXFEfP0hJzMRwLnPvkL6VFxp4UXu2wuzyG2ie?= =?us-ascii?Q?KkI8V0+qVd3dmTNHLYjUSYtFuJZBZi2gSDpgqblj/c21nINIpb0YhoDrRu/B?= =?us-ascii?Q?6EIMfaZX0bvTe1gCIGIxVxi9aJxXYzp9A7lCJsXaS5EfM+rDkoIW8m0jREdJ?= =?us-ascii?Q?yX1WWrVdQpbIGGvTrSyhRMctQhTSFrbJdy4geiJ+UxeyHEvXWM2dIbemMO5D?= =?us-ascii?Q?YT8nlxtFduJL7EE9vM5+9RCZno3vpunZFg8mGK2uzql7Ak6QcwNnAlmh/gk7?= =?us-ascii?Q?sdML6kQcyoqLZ7kGY55gWwEL2iAywnr5iKo9ZDToWB74VRxTA+GLsvgmxu52?= =?us-ascii?Q?8aE+FKrFsWGJlcb8VJS6TV/TzUAin1J1evkU++Hvj7XCPDhrmrhwiRzaB6F0?= =?us-ascii?Q?rFtPtsEcOz43rgOIVcGKQC6Nx/+FW6wwtVf3xg8WaRVSNTKRDZgPKDENVCJt?= =?us-ascii?Q?GXHj4GJ7YuLm5tovOGa+GZU2vBeu5uRVan+dtAbpQYnOlfQ1sJ5jcKChVFMX?= =?us-ascii?Q?IFzs6v/QLuFJ5xo/0FMH/9e1CE9Hx0HdHN2zi4VmgcDCtqBr6FQSOtonUfpS?= =?us-ascii?Q?LjESwdMh1MjbnmbXuny1zB53vZTZEVK828CgtuxliuINll1IFCbMS8GC/b99?= =?us-ascii?Q?yo/N3pbPLIvcE5YttPiyJjPswH0DMayN3ICT8LebnWZnFaoo150Wr3mBswcE?= =?us-ascii?Q?Ly/CCm8E4mftB4jUTP5bsOQeRsvdeHEZAt3XBaD0t9CwpOjFdMm8g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0991; 6:F6VsvWWefikPv+vYcD7mkMYnBA1nXLxTvGGKdvhbN9ME0fVQU0phYTt5xTuqckJh2DAVX1g6ERsjvIjBx6QI0VEXsn8ijHJIhDOUuty3+jhZdy2q4HsN1rM4aOFIU92tEU+RCDqojL2UL7GmB1cVIugbSD69bc13smQPazWZgzHr2+Ll3763qTNaa91iMzkl2bl6pYtb0C/MwYUtcRKkq5Pce58gsXG+3Dzh3HpNWjeY9q1fwDrrka811q4r45ThLnj/9YGLrB+oFahANzR9voc52o2apElwJHY1u1i/qf9sCV+NfK5VE7fWpS73sg+DTs/QQewtdmF0Yt9o1ZHlTA==; 5:Fmtf301ld1S2GVRwFoJof4++PamRAlLmlUxRpLF5AQPyYLQNnwTavNjfrTvta/1ATsUpMYKMFuQMpdKq81A1QcesGgutB2GwNveGN0QiGVb8/sCRSvtPRrpKuDZL38EDBAOH31eTD2oJ411ZbaeL6A==; 24:bPLXLhBxAZeE66ywaFM3kfkh1femM5QDnloKw0GaymY7GuftrBsjYb2TjkBLd4V+4eyBbOCDTaDdBu3wV8V+ViSKwVueYksDpDVSMOip2Vc=; 7:gk6AcECwEAGt0fkqaKS30lQ3OcVgjT/iJE9GE8WW0VP4ffftBRzhhbkS4u5FncVRLzMcjRxfVIWmX0oKSObbFxoLHrOARoUX11YxnRFSjPl5uLPI47RUjgQrTvCAoF3JQDEw9eqb4D1cwO40o+K8r9bHY3zzc1d9k2+uQC2+gy4kKAtVfFXha/pHUMg9LgOZjdcJh6TKg+vG6u3jgeY7GjBu//l22YO5BGglNtmvPwA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR06MB0991; 20:2irvLd7QX4xK5UA180y87jHUoVU4aKqQHkMpx2R4Yezu4gXurnd2DxXySkKrOYQ4HsHSkYDtZEJyti3ojY/6z5ctI8zlm7zMbxOcdpwKsV4/ZjreONhgt7CPiZx9eyAcRLFzXia2Bn73yEuVj4cQhdy+DaUpMb7evEKyab4nOuQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2017 08:07:52.7409 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR06MB0991 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 fixes two issues: - the usbhsf_fifo_clear() is possible to cause 10 msec delay if the pipe is RX direction and empty because the FRDY bit will never be set to 1 in such case. - sets the BCLR of {C,Dn}FIFOCTR to 1 even when it's non-DCP pipe and the FRDY bit sets to 0. Fixes: e8d548d54968 ("usb: renesas_usbhs: fifo became independent from pipe.") Cc: # v3.1+ Signed-off-by: Yoshihiro Shimoda --- This patch set is based on the Felipe's usb.git / testing/fixes branch (The commit is 7661ca09b2ff98f48693f431bb01fed62830e433). drivers/usb/renesas_usbhs/fifo.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index d1af831..68f2690 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -282,11 +282,26 @@ static void usbhsf_fifo_clear(struct usbhs_pipe *pipe, struct usbhs_fifo *fifo) { struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); + int ret = 0; - if (!usbhs_pipe_is_dcp(pipe)) - usbhsf_fifo_barrier(priv, fifo); + if (!usbhs_pipe_is_dcp(pipe)) { + /* + * This driver checks the pipe condition first to avoid -EBUSY + * from usbhsf_fifo_barrier() with about 10 msec delay in + * the interrupt handler if the pipe is RX direction and empty. + */ + if (usbhs_pipe_is_dir_in(pipe)) + ret = usbhs_pipe_is_accessible(pipe); + if (!ret) + ret = usbhsf_fifo_barrier(priv, fifo); + } - usbhs_write(priv, fifo->ctr, BCLR); + /* + * if non-DCP pipe, this driver should set BCLR when + * usbhsf_fifo_barrier() returns 0. + */ + if (!ret) + usbhs_write(priv, fifo->ctr, BCLR); } static int usbhsf_fifo_rcv_len(struct usbhs_priv *priv,