From patchwork Sun Jan 29 12:04:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 49962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1719052wrn; Sun, 29 Jan 2023 04:11:30 -0800 (PST) X-Google-Smtp-Source: AK7set8GKUyxvJ+ufcOH2SZXaiSUAQcqBVcPmqur2T3uyL/s4DS+GKQHF7sXLUAdHJT//Zw+gwww X-Received: by 2002:a17:906:4dcf:b0:87b:cdab:988e with SMTP id f15-20020a1709064dcf00b0087bcdab988emr9902978ejw.21.1674994290022; Sun, 29 Jan 2023 04:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674994290; cv=none; d=google.com; s=arc-20160816; b=s/GFOzPgjjOqcZdbnmH0ZBPoRcmX7CG1Vv/8EuxktqAyOL0K99dDpK/LwduZQ5Y9YW 2u3wY6UPHZUo33FGKpr+DKeta6UM1LbXCBJPVj7yJtRyF8u9gxoQkWsrBSSKkBltRUV2 1KhhqAO12DnRmRS9eFo9q6feHz9iEfQlyopFtI+3Cct1k0IMWCFlSYYxOY2vjABTIwai Vur5CmvLdEg6I4Gd+4Zdtdh5IwcfePjzPraLVkbSwOz7ss8FrKYiaOACod3LhhQQh2bB 0TaC9CHG5kNsQXOFjgUgABl3mBi58YK+cmQM9xId9fzl0J4CT5jJs7Fy/bpAQ8lmOZ0a oMLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LiDIJ3Rmd36AtqhKNh3sjPZ+wGugz3vIRIvjOepxpSg=; b=jh0epiI8FqjFp3yp9AaThNRjV5zft0pl02y5pOvkO5SUKAP5kTX2zmU1rCLK1rTwhW azGQzTicFVDouDiPbzh8u4IHV0zEOXorGiEX3pTol0SXyqT0AZgG/apiIi7sSXDkeHWe Io/N5Ogyi1Z7A757hHVCHqzmTA3iKCbekOmPVfxo4z6C3I+nQPNioxdS8S4sd8Nm1FRW ExmdR/XtssMcfiT7Pjrr+krIudNbtlOgiy2cShgM7yhTABaiv5xTpQIuPC2cHeUwWPDm Xizf0zzCRV2DTwRQtCf21U1VTV1uhr+XWbgTJGyLDQBl5cNqBl+XaeXnd9/9WqDraAn4 Nf3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=jJ1s281I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 10-20020a170906028a00b008875432b6aasi1645246ejf.237.2023.01.29.04.11.05; Sun, 29 Jan 2023 04:11:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=jJ1s281I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234887AbjA2MFP (ORCPT + 99 others); Sun, 29 Jan 2023 07:05:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234878AbjA2MFM (ORCPT ); Sun, 29 Jan 2023 07:05:12 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54DA2234FC; Sun, 29 Jan 2023 04:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1674993891; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LiDIJ3Rmd36AtqhKNh3sjPZ+wGugz3vIRIvjOepxpSg=; b=jJ1s281Ict/W29rTi8nGIVpF/Vj/+9pxvN7t1X0FnNXwtM2kM90LY9uueI6Lgv7io7c0lk 6WSjSrbaPGLjll1qfUG0uJsP08gyjg5vu/tePGTgyLgW5f9CjhKGJ9IAAFygK4wCf8jen1 aKgrccczdD7zIsYnkbiKXKn74yIrvpU= From: Paul Cercueil To: Alessandro Zummo , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH v3 2/4] rtc: jz4740: Use readl_poll_timeout Date: Sun, 29 Jan 2023 12:04:40 +0000 Message-Id: <20230129120442.22858-3-paul@crapouillou.net> In-Reply-To: <20230129120442.22858-1-paul@crapouillou.net> References: <20230129120442.22858-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756358812630561267?= X-GMAIL-MSGID: =?utf-8?q?1756358812630561267?= Use readl_poll_timeout() from instead of using custom poll loops. The timeout settings are different, but that shouldn't be much of a problem. Instead of polling 10000 times in a close loop, it polls for one millisecond. Signed-off-by: Paul Cercueil --- drivers/rtc/rtc-jz4740.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c index c383719292c7..4ee6e5ee09b1 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -69,19 +70,15 @@ static inline uint32_t jz4740_rtc_reg_read(struct jz4740_rtc *rtc, size_t reg) static int jz4740_rtc_wait_write_ready(struct jz4740_rtc *rtc) { uint32_t ctrl; - int timeout = 10000; - do { - ctrl = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_CTRL); - } while (!(ctrl & JZ_RTC_CTRL_WRDY) && --timeout); - - return timeout ? 0 : -EIO; + return readl_poll_timeout(rtc->base + JZ_REG_RTC_CTRL, ctrl, + ctrl & JZ_RTC_CTRL_WRDY, 0, 1000); } static inline int jz4780_rtc_enable_write(struct jz4740_rtc *rtc) { uint32_t ctrl; - int ret, timeout = 10000; + int ret; ret = jz4740_rtc_wait_write_ready(rtc); if (ret != 0) @@ -89,11 +86,8 @@ static inline int jz4780_rtc_enable_write(struct jz4740_rtc *rtc) writel(JZ_RTC_WENR_MAGIC, rtc->base + JZ_REG_RTC_WENR); - do { - ctrl = readl(rtc->base + JZ_REG_RTC_WENR); - } while (!(ctrl & JZ_RTC_WENR_WEN) && --timeout); - - return timeout ? 0 : -EIO; + return readl_poll_timeout(rtc->base + JZ_REG_RTC_WENR, ctrl, + ctrl & JZ_RTC_WENR_WEN, 0, 1000); } static inline int jz4740_rtc_reg_write(struct jz4740_rtc *rtc, size_t reg,