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 83C18C2BB84 for ; Thu, 10 Sep 2020 08:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D1F02076C for ; Thu, 10 Sep 2020 08:31:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="UypEheTd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730356AbgIJIbM (ORCPT ); Thu, 10 Sep 2020 04:31:12 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:34211 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730397AbgIJIYh (ORCPT ); Thu, 10 Sep 2020 04:24:37 -0400 X-UUID: 127c51fee3154bd9a5212ba8b0bc5617-20200910 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=RiKpsCZJex/4PNC9PXP3CBjdPJWYcy6TOG9QBDJhfJg=; b=UypEheTd03Zs7dYGpSOC8vGgcuuSQf8HEoyn65/jadsDBEwHF+u3ZHD4MZnhby4YvfLCmE7ESmJ2UhqzbCw3muUCOh/ZFDJwpWbSyqYjXn1n0cWEGJlhSwJX/kxBIdHPbmdAbOGdp0mMylbmU4Wkr+lYwCYvi/Z1QyM+o4uRN2c=; X-UUID: 127c51fee3154bd9a5212ba8b0bc5617-20200910 Received: from mtkcas35.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 111676909; Thu, 10 Sep 2020 16:24:12 +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; Thu, 10 Sep 2020 16:24:11 +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; Thu, 10 Sep 2020 16:24:10 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman CC: Mathias Nyman , Felipe Balbi , Matthias Brugger , Douglas Anderson , Chunfeng Yun , Daniel Thompson , "Eric W. Biederman" , Lee Jones , Sumit Garg , Jann Horn , Arnd Bergmann , Jason Yan , Chuhong Yuan , "Gustavo A. R. Silva" , Ben Dooks , Saurav Girepunje , , , , Subject: [PATCH RESEND v3 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Thu, 10 Sep 2020 16:21:50 +0800 Message-ID: <1599726112-4439-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> References: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 9E9FC7DF85F7DECF1FBA81FC92D4B5528B3C18E67E2F8B37039BCCB0CD400C822000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VXNlIHJlYWRsX3BvbGxfdGltZW91dF9hdG9taWMoKSB0byBzaW1wbGlmeSBjb2RlDQoNClNpZ25l ZC1vZmYtYnk6IENodW5mZW5nIFl1biA8Y2h1bmZlbmcueXVuQG1lZGlhdGVrLmNvbT4NCi0tLQ0K djM6IHJlLWFsaWduIGFyZ3VtZW50IG9mIGxvZyBzdWdnZXN0ZWQgYnkgU2VyZ2VpDQoNCnYyOiB1 ZGVsYXkgMTB1cyBpbnN0ZWFkIG9mIDIwdXMgYWNjb3JkaW5nIHRvIGtlcm5lbGRvYw0KLS0tDQog ZHJpdmVycy91c2IvcGh5L3BoeS1tdi11c2IuYyB8IDE4ICsrKysrKysrLS0tLS0tLS0tLQ0KIDEg ZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0t Z2l0IGEvZHJpdmVycy91c2IvcGh5L3BoeS1tdi11c2IuYyBiL2RyaXZlcnMvdXNiL3BoeS9waHkt bXYtdXNiLmMNCmluZGV4IGNlNzY3ZWMuLjU3NmQ5MjUgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL3Vz Yi9waHkvcGh5LW12LXVzYi5jDQorKysgYi9kcml2ZXJzL3VzYi9waHkvcGh5LW12LXVzYi5jDQpA QCAtOCw2ICs4LDcgQEANCiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQogI2luY2x1ZGUgPGxp bnV4L2tlcm5lbC5oPg0KICNpbmNsdWRlIDxsaW51eC9pby5oPg0KKyNpbmNsdWRlIDxsaW51eC9p b3BvbGwuaD4NCiAjaW5jbHVkZSA8bGludXgvdWFjY2Vzcy5oPg0KICNpbmNsdWRlIDxsaW51eC9k ZXZpY2UuaD4NCiAjaW5jbHVkZSA8bGludXgvcHJvY19mcy5oPg0KQEAgLTEzNSw4ICsxMzYsOCBA QCBzdGF0aWMgaW50IG12X290Z19zZXRfdGltZXIoc3RydWN0IG12X290ZyAqbXZvdGcsIHVuc2ln bmVkIGludCBpZCwNCiANCiBzdGF0aWMgaW50IG12X290Z19yZXNldChzdHJ1Y3QgbXZfb3RnICpt dm90ZykNCiB7DQotCXVuc2lnbmVkIGludCBsb29wczsNCiAJdTMyIHRtcDsNCisJaW50IHJldDsN CiANCiAJLyogU3RvcCB0aGUgY29udHJvbGxlciAqLw0KIAl0bXAgPSByZWFkbCgmbXZvdGctPm9w X3JlZ3MtPnVzYmNtZCk7DQpAQCAtMTQ2LDE1ICsxNDcsMTIgQEAgc3RhdGljIGludCBtdl9vdGdf cmVzZXQoc3RydWN0IG12X290ZyAqbXZvdGcpDQogCS8qIFJlc2V0IHRoZSBjb250cm9sbGVyIHRv IGdldCBkZWZhdWx0IHZhbHVlcyAqLw0KIAl3cml0ZWwoVVNCQ01EX0NUUkxfUkVTRVQsICZtdm90 Zy0+b3BfcmVncy0+dXNiY21kKTsNCiANCi0JbG9vcHMgPSA1MDA7DQotCXdoaWxlIChyZWFkbCgm bXZvdGctPm9wX3JlZ3MtPnVzYmNtZCkgJiBVU0JDTURfQ1RSTF9SRVNFVCkgew0KLQkJaWYgKGxv b3BzID09IDApIHsNCi0JCQlkZXZfZXJyKCZtdm90Zy0+cGRldi0+ZGV2LA0KLQkJCQkiV2FpdCBm b3IgUkVTRVQgY29tcGxldGVkIFRJTUVPVVRcbiIpOw0KLQkJCXJldHVybiAtRVRJTUVET1VUOw0K LQkJfQ0KLQkJbG9vcHMtLTsNCi0JCXVkZWxheSgyMCk7DQorCXJldCA9IHJlYWRsX3BvbGxfdGlt ZW91dF9hdG9taWMoJm12b3RnLT5vcF9yZWdzLT51c2JjbWQsIHRtcCwNCisJCQkJKHRtcCAmIFVT QkNNRF9DVFJMX1JFU0VUKSwgMTAsIDEwMDAwKTsNCisJaWYgKHJldCA8IDApIHsNCisJCWRldl9l cnIoJm12b3RnLT5wZGV2LT5kZXYsDQorCQkJIldhaXQgZm9yIFJFU0VUIGNvbXBsZXRlZCBUSU1F T1VUXG4iKTsNCisJCXJldHVybiByZXQ7DQogCX0NCiANCiAJd3JpdGVsKDB4MCwgJm12b3RnLT5v cF9yZWdzLT51c2JpbnRyKTsNCi0tIA0KMS45LjENCg== 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=-12.7 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 79E06C43461 for ; Thu, 10 Sep 2020 08:31:30 +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 15C3B20770 for ; Thu, 10 Sep 2020 08:31:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sBmiz92H"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="e30xf16H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15C3B20770 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=4Ls7v58J5BtrsO76xOrLWSSC3ljqq1i8LlAc7Xxz34Y=; b=sBmiz92HyCptNzBmV/5nb5g5/ X3Rp/ALPBeZ0/iX6rDII6XajnQ930hACmU+fvSbBr7QrwXezQus/pNbY4E2KDXlj6N67uEanhogMK a8GeIWvyKX+d3ZSmh81zKiKo4Kc47bD3bYMOl0o7L7yQ5g2F33ZdSn9d4ivc4rBQ0r7bKL8YwDS0O tpDgHxnvu4m3+p1lxS7JjxrA2CavRaIHjl5WthOrzJuGnLV1Z7lNYXjsDxSptC3GzhROyDX4dfSpt zINJLFKRSPqWtp6ygUc/dp7A1LCHAC4rm2/xn0m3TVK6no5SO3sEEt9v4mh1pYi8PijWCzLcLICqS Ps4Kyv/6A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGHzB-0004Rg-06; Thu, 10 Sep 2020 08:31:17 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGHyh-0004BM-Gr; Thu, 10 Sep 2020 08:30:48 +0000 X-UUID: be919a1159c441e3900083d89317842e-20200910 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=RiKpsCZJex/4PNC9PXP3CBjdPJWYcy6TOG9QBDJhfJg=; b=e30xf16HfRVQDlc9BzHFkGd/E8STfMyEMtOdC+aZ4A5PZ0VY3r3LhGv2MwSlJ2DGBupaeyXr8b/43aJ3S8bDwA5FOEKDKWXhvX3bts36vqj5nZpy0hIrPf73crIbEBRF1E7pcu/7qWnLevLIYp7DCr3pX0ljMaR5U3n5wqJVfa0=; X-UUID: be919a1159c441e3900083d89317842e-20200910 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 856505944; Thu, 10 Sep 2020 00:24:26 -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; Thu, 10 Sep 2020 01:24:14 -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; Thu, 10 Sep 2020 16:24:11 +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; Thu, 10 Sep 2020 16:24:10 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman Subject: [PATCH RESEND v3 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Thu, 10 Sep 2020 16:21:50 +0800 Message-ID: <1599726112-4439-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> References: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 9E9FC7DF85F7DECF1FBA81FC92D4B5528B3C18E67E2F8B37039BCCB0CD400C822000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_043047_709690_82BC66C0 X-CRM114-Status: GOOD ( 15.33 ) 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: Felipe Balbi , Daniel Thompson , linux-usb@vger.kernel.org, Arnd Bergmann , Mathias Nyman , Sumit Garg , linux-kernel@vger.kernel.org, Jann Horn , Chuhong Yuan , Douglas Anderson , "Gustavo A. R. Silva" , Saurav Girepunje , Chunfeng Yun , Jason Yan , linux-mediatek@lists.infradead.org, "Eric W. Biederman" , Matthias Brugger , Lee Jones , Ben Dooks , 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 --- 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=-12.7 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 DAB69C433E2 for ; Thu, 10 Sep 2020 08:32:31 +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 657E82076C for ; Thu, 10 Sep 2020 08:32:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="myG5eqWS"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="e30xf16H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 657E82076C 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=MfXQBTIRx86z/f1peBpfZynYXbZWIyvi45GhjfPmgAI=; b=myG5eqWSHIcQu6uqcPeWL3YHu um3qJZAvvsw+QxGTiUUlM1jnAZ0lUiE4kS/81156UruM/lZNSWzeUJocEx3k0WjXH2XNI3nP4X2nk N2waB8SjWp+n2DWkim9y4SKtz/AbwKY33oh+fwFjnLhnO+yKOWl/j0rk60gnHvg5LzeKVA7u7FN5w o/Qn7t2xWCVlqxb6lIG4dpwXben/C8U7yLmEbR2zs+eRDdfVyPyWSbtysGxw5fkPGneUPT0nnbCqF sNbfL/4OyZm1ZKdTs0Oh6fLBYhdzqCAmZU8J7WfC5Aluultth7k5YTdYRvT7ECeu3Gok2hlBw3iwN pefPYAtQw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGHz7-0004O6-EM; Thu, 10 Sep 2020 08:31:13 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGHyh-0004BM-Gr; Thu, 10 Sep 2020 08:30:48 +0000 X-UUID: be919a1159c441e3900083d89317842e-20200910 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=RiKpsCZJex/4PNC9PXP3CBjdPJWYcy6TOG9QBDJhfJg=; b=e30xf16HfRVQDlc9BzHFkGd/E8STfMyEMtOdC+aZ4A5PZ0VY3r3LhGv2MwSlJ2DGBupaeyXr8b/43aJ3S8bDwA5FOEKDKWXhvX3bts36vqj5nZpy0hIrPf73crIbEBRF1E7pcu/7qWnLevLIYp7DCr3pX0ljMaR5U3n5wqJVfa0=; X-UUID: be919a1159c441e3900083d89317842e-20200910 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 856505944; Thu, 10 Sep 2020 00:24:26 -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; Thu, 10 Sep 2020 01:24:14 -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; Thu, 10 Sep 2020 16:24:11 +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; Thu, 10 Sep 2020 16:24:10 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman Subject: [PATCH RESEND v3 09/11] usb: phy: phy-mv-usb: convert to readl_poll_timeout_atomic() Date: Thu, 10 Sep 2020 16:21:50 +0800 Message-ID: <1599726112-4439-9-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> References: <1599726112-4439-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 9E9FC7DF85F7DECF1FBA81FC92D4B5528B3C18E67E2F8B37039BCCB0CD400C822000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_043047_709690_82BC66C0 X-CRM114-Status: GOOD ( 15.33 ) 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: Felipe Balbi , Daniel Thompson , linux-usb@vger.kernel.org, Arnd Bergmann , Mathias Nyman , Sumit Garg , linux-kernel@vger.kernel.org, Jann Horn , Chuhong Yuan , Douglas Anderson , "Gustavo A. R. Silva" , Saurav Girepunje , Chunfeng Yun , Jason Yan , linux-mediatek@lists.infradead.org, "Eric W. Biederman" , Matthias Brugger , Lee Jones , Ben Dooks , 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 --- 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