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=-11.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,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 23574C43463 for ; Mon, 21 Sep 2020 06:17:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E969720735 for ; Mon, 21 Sep 2020 06:17:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ar2WyMZz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726494AbgIUGR2 (ORCPT ); Mon, 21 Sep 2020 02:17:28 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:44379 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726149AbgIUGRQ (ORCPT ); Mon, 21 Sep 2020 02:17:16 -0400 X-UUID: 9b8aeb5f100842b88219cd125606aac5-20200921 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=fhoC7nd4R36M3issGh+SxVPkb1Qjg4iuhqpKgwaNaKE=; b=ar2WyMZzX2bOPL47+URojAsnd8qASu3pjqCCyQCTaqvuXRJMR+9fW7EXGUmn8P8ispWphQYabRcdzgtN70lqNH71mBtADueARgUzO5PTcmz+4IVjG4lXxVsm8fhu+OCsjJfSeM4kYC2rX2fOhAWGutJE6WdTwDi4NUmk61diOzg=; X-UUID: 9b8aeb5f100842b88219cd125606aac5-20200921 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 50010507; Mon, 21 Sep 2020 14:17:11 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 21 Sep 2020 14:17:10 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 21 Sep 2020 14:17:08 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi CC: Mathias Nyman , Matthias Brugger , Chunfeng Yun , "Eric W. Biederman" , Sumit Garg , Lee Jones , Jann Horn , Jason Yan , Arnd Bergmann , Chuhong Yuan , "Gustavo A. R. Silva" , "Ben Dooks (Codethink)" , Saurav Girepunje , , , , , Sergei Shtylyov , Daniel Thompson Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Mon, 21 Sep 2020 14:13:33 +0800 Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> References: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 2F9FBD9981B001EA895A14F6E8D251A0B594F6BC5073CA2F55F375A17B5E66502000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VXNlIHJlYWRsX3BvbGxfdGltZW91dF9hdG9taWMoKSB0byBzaW1wbGlmeSBjb2RlDQoNClNpZ25l ZC1vZmYtYnk6IENodW5mZW5nIFl1biA8Y2h1bmZlbmcueXVuQG1lZGlhdGVrLmNvbT4NCi0tLQ0K djQ6IG5vIGNoYW5nZXMNCg0KdjM6IHJlLWFsaWduIGFyZ3VtZW50IG9mIGxvZyBzdWdnZXN0ZWQg YnkgU2VyZ2VpDQoNCnYyOiB1ZGVsYXkgMTB1cyBpbnN0ZWFkIG9mIDIwdXMgYWNjb3JkaW5nIHRv IGtlcm5lbGRvYw0KLS0tDQogZHJpdmVycy91c2IvcGh5L3BoeS1tdi11c2IuYyB8IDE4ICsrKysr KysrLS0tLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEwIGRlbGV0 aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvcGh5L3BoeS1tdi11c2IuYyBiL2Ry aXZlcnMvdXNiL3BoeS9waHktbXYtdXNiLmMNCmluZGV4IGNlNzY3ZWMuLjU3NmQ5MjUgMTAwNjQ0 DQotLS0gYS9kcml2ZXJzL3VzYi9waHkvcGh5LW12LXVzYi5jDQorKysgYi9kcml2ZXJzL3VzYi9w aHkvcGh5LW12LXVzYi5jDQpAQCAtOCw2ICs4LDcgQEANCiAjaW5jbHVkZSA8bGludXgvbW9kdWxl Lmg+DQogI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPg0KICNpbmNsdWRlIDxsaW51eC9pby5oPg0K KyNpbmNsdWRlIDxsaW51eC9pb3BvbGwuaD4NCiAjaW5jbHVkZSA8bGludXgvdWFjY2Vzcy5oPg0K ICNpbmNsdWRlIDxsaW51eC9kZXZpY2UuaD4NCiAjaW5jbHVkZSA8bGludXgvcHJvY19mcy5oPg0K QEAgLTEzNSw4ICsxMzYsOCBAQCBzdGF0aWMgaW50IG12X290Z19zZXRfdGltZXIoc3RydWN0IG12 X290ZyAqbXZvdGcsIHVuc2lnbmVkIGludCBpZCwNCiANCiBzdGF0aWMgaW50IG12X290Z19yZXNl dChzdHJ1Y3QgbXZfb3RnICptdm90ZykNCiB7DQotCXVuc2lnbmVkIGludCBsb29wczsNCiAJdTMy IHRtcDsNCisJaW50IHJldDsNCiANCiAJLyogU3RvcCB0aGUgY29udHJvbGxlciAqLw0KIAl0bXAg PSByZWFkbCgmbXZvdGctPm9wX3JlZ3MtPnVzYmNtZCk7DQpAQCAtMTQ2LDE1ICsxNDcsMTIgQEAg c3RhdGljIGludCBtdl9vdGdfcmVzZXQoc3RydWN0IG12X290ZyAqbXZvdGcpDQogCS8qIFJlc2V0 IHRoZSBjb250cm9sbGVyIHRvIGdldCBkZWZhdWx0IHZhbHVlcyAqLw0KIAl3cml0ZWwoVVNCQ01E X0NUUkxfUkVTRVQsICZtdm90Zy0+b3BfcmVncy0+dXNiY21kKTsNCiANCi0JbG9vcHMgPSA1MDA7 DQotCXdoaWxlIChyZWFkbCgmbXZvdGctPm9wX3JlZ3MtPnVzYmNtZCkgJiBVU0JDTURfQ1RSTF9S RVNFVCkgew0KLQkJaWYgKGxvb3BzID09IDApIHsNCi0JCQlkZXZfZXJyKCZtdm90Zy0+cGRldi0+ ZGV2LA0KLQkJCQkiV2FpdCBmb3IgUkVTRVQgY29tcGxldGVkIFRJTUVPVVRcbiIpOw0KLQkJCXJl dHVybiAtRVRJTUVET1VUOw0KLQkJfQ0KLQkJbG9vcHMtLTsNCi0JCXVkZWxheSgyMCk7DQorCXJl dCA9IHJlYWRsX3BvbGxfdGltZW91dF9hdG9taWMoJm12b3RnLT5vcF9yZWdzLT51c2JjbWQsIHRt cCwNCisJCQkJKHRtcCAmIFVTQkNNRF9DVFJMX1JFU0VUKSwgMTAsIDEwMDAwKTsNCisJaWYgKHJl dCA8IDApIHsNCisJCWRldl9lcnIoJm12b3RnLT5wZGV2LT5kZXYsDQorCQkJIldhaXQgZm9yIFJF U0VUIGNvbXBsZXRlZCBUSU1FT1VUXG4iKTsNCisJCXJldHVybiByZXQ7DQogCX0NCiANCiAJd3Jp dGVsKDB4MCwgJm12b3RnLT5vcF9yZWdzLT51c2JpbnRyKTsNCi0tIA0KMS45LjENCg== 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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 95248C43464 for ; Mon, 21 Sep 2020 06:25:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4352220735 for ; Mon, 21 Sep 2020 06:25:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="yvv7yKro"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="hAsT6uFS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4352220735 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=3Ge8cXWg17UlfFxp7r2vtibzCtC8bRvXDcR32jExMwQ=; b=yvv7yKro0K3G9mN3vze0a3OBu 71UTQLtncyDlgJcQonfjR/FriddVJDYMYiDhiujX0bR5lZ2JkSB0rNwTYZGfUk6gNCTEWtHxmm3cM i/1oIAIKO2WUkRXHBlza9h/68YWNLP6xfG19ixHFrDvw14E0fy0otp/bNwSc50lji7BZsC1lw13ht VszMCUlR1EOcvsW961sD7b/dc3SxE3uBahEA1492J5hE/8twp3jOmeX830G1f+EsBQIJY6gDEPeUE EflnG1YImDDf3tUvo7AK4rb0cXs7o/9vQslyx1oAJIeUnL25DB/s3Fdb3M6r+fjwzk0vCHzwlNlvW Uxt3g5XjA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKFGY-0005or-Qr; Mon, 21 Sep 2020 06:25:34 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKFFi-0005Tk-F2; Mon, 21 Sep 2020 06:24:46 +0000 X-UUID: 2b1b23fa444c44f7bebeb518c292825c-20200920 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=fhoC7nd4R36M3issGh+SxVPkb1Qjg4iuhqpKgwaNaKE=; b=hAsT6uFScZzYn1TFbtx1oo5dO16HTZegY8tY2EKHoSPWy6NcBFKqrI3rH5V9f8zbzwwi7bWfO29BeMf3wyCK+JIxAuRdJKSc1gzKNz5JEgIq1JvQDuKPM2eDFDbW3wgKwZgHYv46dED1jYXtePEErZHfhKdlCxukIgN/1O2tbFI=; X-UUID: 2b1b23fa444c44f7bebeb518c292825c-20200920 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 410405657; Sun, 20 Sep 2020 22:24:39 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 20 Sep 2020 23:17:12 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 21 Sep 2020 14:17:10 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 21 Sep 2020 14:17:08 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Mon, 21 Sep 2020 14:13:33 +0800 Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> References: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 2F9FBD9981B001EA895A14F6E8D251A0B594F6BC5073CA2F55F375A17B5E66502000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200921_022442_684561_95131AEE X-CRM114-Status: GOOD ( 15.93 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sumit Garg , Daniel Thompson , linux-usb@vger.kernel.org, Arnd Bergmann , Mathias Nyman , Jann Horn , Jason Yan , Chuhong Yuan , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org, Saurav Girepunje , Chunfeng Yun , "Ben Dooks \(Codethink\)" , linux-mediatek@lists.infradead.org, "Eric W. Biederman" , Matthias Brugger , Lee Jones , Sergei Shtylyov , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Use readl_poll_timeout_atomic() to simplify code Signed-off-by: Chunfeng Yun --- v4: no changes v3: re-align argument of log suggested by Sergei v2: udelay 10us instead of 20us according to kerneldoc --- drivers/usb/phy/phy-mv-usb.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c index ce767ec..576d925 100644 --- a/drivers/usb/phy/phy-mv-usb.c +++ b/drivers/usb/phy/phy-mv-usb.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -135,8 +136,8 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id, static int mv_otg_reset(struct mv_otg *mvotg) { - unsigned int loops; u32 tmp; + int ret; /* Stop the controller */ tmp = readl(&mvotg->op_regs->usbcmd); @@ -146,15 +147,12 @@ static int mv_otg_reset(struct mv_otg *mvotg) /* Reset the controller to get default values */ writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd); - loops = 500; - while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) { - if (loops == 0) { - dev_err(&mvotg->pdev->dev, - "Wait for RESET completed TIMEOUT\n"); - return -ETIMEDOUT; - } - loops--; - udelay(20); + ret = readl_poll_timeout_atomic(&mvotg->op_regs->usbcmd, tmp, + (tmp & USBCMD_CTRL_RESET), 10, 10000); + if (ret < 0) { + dev_err(&mvotg->pdev->dev, + "Wait for RESET completed TIMEOUT\n"); + return ret; } writel(0x0, &mvotg->op_regs->usbintr); -- 1.9.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 A2B1AC43465 for ; Mon, 21 Sep 2020 06:26:57 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 547D920739 for ; Mon, 21 Sep 2020 06:26:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QQDOmGE/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="hAsT6uFS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 547D920739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=8yuah0FppKNUuy3hMk3TPjL4cSjtY6q4BwA6rJIT9ck=; b=QQDOmGE/6TupX8i8ryc2q82In dujYr+mbZfxwEWXRwCK5czE37kEL6qdn6j1Lwue2OPCMd1ccavfemewCnNVPHPYmCYrrfYBSVWnmH HlIpS527z+Gruei8Q9fsZmG01TQWktWnDfQZ7ZAe/VDqqlTjn6rc+RRo43Z6U/36Blhn9mcrIVr59 NHO3m9xYzYlI0cDSU0jNbbVelx+JYZD9GvRZRLUVyBLmDHRLJoVXRvmoyynbO++QZqKPD0XXSDxWB ChJDhOGvHdI0SNsJlr65s+dXPFOQuNEgluoh8CGp3MZajMVoIG35tfpl/Ovu2VkHHtQmzziAJWB8b 82VcZ0O7w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKFGe-0005tT-VO; Mon, 21 Sep 2020 06:25:40 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKFFi-0005Tk-F2; Mon, 21 Sep 2020 06:24:46 +0000 X-UUID: 2b1b23fa444c44f7bebeb518c292825c-20200920 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=fhoC7nd4R36M3issGh+SxVPkb1Qjg4iuhqpKgwaNaKE=; b=hAsT6uFScZzYn1TFbtx1oo5dO16HTZegY8tY2EKHoSPWy6NcBFKqrI3rH5V9f8zbzwwi7bWfO29BeMf3wyCK+JIxAuRdJKSc1gzKNz5JEgIq1JvQDuKPM2eDFDbW3wgKwZgHYv46dED1jYXtePEErZHfhKdlCxukIgN/1O2tbFI=; X-UUID: 2b1b23fa444c44f7bebeb518c292825c-20200920 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 410405657; Sun, 20 Sep 2020 22:24:39 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 20 Sep 2020 23:17:12 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 21 Sep 2020 14:17:10 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 21 Sep 2020 14:17:08 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi Subject: [PATCH v4 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Mon, 21 Sep 2020 14:13:33 +0800 Message-ID: <1600668815-12135-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> References: <1600668815-12135-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 2F9FBD9981B001EA895A14F6E8D251A0B594F6BC5073CA2F55F375A17B5E66502000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200921_022442_684561_95131AEE X-CRM114-Status: GOOD ( 15.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sumit Garg , Daniel Thompson , linux-usb@vger.kernel.org, Arnd Bergmann , Mathias Nyman , Jann Horn , Jason Yan , Chuhong Yuan , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org, Saurav Girepunje , Chunfeng Yun , "Ben Dooks \(Codethink\)" , linux-mediatek@lists.infradead.org, "Eric W. Biederman" , Matthias Brugger , Lee Jones , Sergei Shtylyov , 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use readl_poll_timeout_atomic() to simplify code Signed-off-by: Chunfeng Yun --- v4: no changes v3: re-align argument of log suggested by Sergei v2: udelay 10us instead of 20us according to kerneldoc --- drivers/usb/phy/phy-mv-usb.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c index ce767ec..576d925 100644 --- a/drivers/usb/phy/phy-mv-usb.c +++ b/drivers/usb/phy/phy-mv-usb.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -135,8 +136,8 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id, static int mv_otg_reset(struct mv_otg *mvotg) { - unsigned int loops; u32 tmp; + int ret; /* Stop the controller */ tmp = readl(&mvotg->op_regs->usbcmd); @@ -146,15 +147,12 @@ static int mv_otg_reset(struct mv_otg *mvotg) /* Reset the controller to get default values */ writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd); - loops = 500; - while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) { - if (loops == 0) { - dev_err(&mvotg->pdev->dev, - "Wait for RESET completed TIMEOUT\n"); - return -ETIMEDOUT; - } - loops--; - udelay(20); + ret = readl_poll_timeout_atomic(&mvotg->op_regs->usbcmd, tmp, + (tmp & USBCMD_CTRL_RESET), 10, 10000); + if (ret < 0) { + dev_err(&mvotg->pdev->dev, + "Wait for RESET completed TIMEOUT\n"); + return ret; } writel(0x0, &mvotg->op_regs->usbintr); -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel