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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 DB41CC433E0 for ; Tue, 26 Jan 2021 05:22:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A47002053B for ; Tue, 26 Jan 2021 05:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730464AbhAZFWU (ORCPT ); Tue, 26 Jan 2021 00:22:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729560AbhAYOh0 (ORCPT ); Mon, 25 Jan 2021 09:37:26 -0500 Received: from leibniz.telenet-ops.be (leibniz.telenet-ops.be [IPv6:2a02:1800:110:4::f00:d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F36AC061797 for ; Mon, 25 Jan 2021 06:36:01 -0800 (PST) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4DPXJ100tLzMt5Tn for ; Mon, 25 Jan 2021 15:27:13 +0100 (CET) Received: from ramsan.of.borg ([84.195.186.194]) by baptiste.telenet-ops.be with bizsmtp id M2S82400F4C55Sk012S8YN; Mon, 25 Jan 2021 15:26:11 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1l42oi-000ej3-1n; Mon, 25 Jan 2021 15:26:08 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1l42oh-004PCO-GS; Mon, 25 Jan 2021 15:26:07 +0100 From: Geert Uytterhoeven To: Magnus Damm Cc: Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven , =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v2] soc: renesas: rcar-sysc: Use readl_poll_timeout_atomic() Date: Mon, 25 Jan 2021 15:26:06 +0100 Message-Id: <20210125142606.1050130-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Replace the open-coded polling loops by calls to the readl_poll_timeout_atomic() helper macro. Signed-off-by: Geert Uytterhoeven Reviewed-by: Niklas Söderlund --- To be queued in renesas-devel for v5.12. v2: - Add Reviewed-by, - Make "k" unsigned. --- drivers/soc/renesas/rcar-sysc.c | 35 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c index a00bb098e1fe7488..53387a72ca00ce79 100644 --- a/drivers/soc/renesas/rcar-sysc.c +++ b/drivers/soc/renesas/rcar-sysc.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "rcar-sysc.h" @@ -44,13 +45,13 @@ #define PWRER_OFFS 0x14 /* Power Shutoff/Resume Error */ -#define SYSCSR_RETRIES 100 +#define SYSCSR_TIMEOUT 100 #define SYSCSR_DELAY_US 1 #define PWRER_RETRIES 100 #define PWRER_DELAY_US 1 -#define SYSCISR_RETRIES 1000 +#define SYSCISR_TIMEOUT 1000 #define SYSCISR_DELAY_US 1 #define RCAR_PD_ALWAYS_ON 32 /* Always-on power area */ @@ -68,7 +69,8 @@ static u32 rcar_sysc_extmask_offs, rcar_sysc_extmask_val; static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, bool on) { unsigned int sr_bit, reg_offs; - int k; + u32 val; + int ret; if (on) { sr_bit = SYSCSR_PONENB; @@ -79,13 +81,10 @@ static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, bool on) } /* Wait until SYSC is ready to accept a power request */ - for (k = 0; k < SYSCSR_RETRIES; k++) { - if (ioread32(rcar_sysc_base + SYSCSR) & BIT(sr_bit)) - break; - udelay(SYSCSR_DELAY_US); - } - - if (k == SYSCSR_RETRIES) + ret = readl_poll_timeout_atomic(rcar_sysc_base + SYSCSR, val, + val & BIT(sr_bit), SYSCSR_DELAY_US, + SYSCSR_TIMEOUT); + if (ret) return -EAGAIN; /* Submit power shutoff or power resume request */ @@ -99,10 +98,9 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on) { unsigned int isr_mask = BIT(sysc_ch->isr_bit); unsigned int chan_mask = BIT(sysc_ch->chan_bit); - unsigned int status; + unsigned int status, k; unsigned long flags; - int ret = 0; - int k; + int ret; spin_lock_irqsave(&rcar_sysc_lock, flags); @@ -145,13 +143,10 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on) } /* Wait until the power shutoff or resume request has completed * */ - for (k = 0; k < SYSCISR_RETRIES; k++) { - if (ioread32(rcar_sysc_base + SYSCISR) & isr_mask) - break; - udelay(SYSCISR_DELAY_US); - } - - if (k == SYSCISR_RETRIES) + ret = readl_poll_timeout_atomic(rcar_sysc_base + SYSCISR, status, + status & isr_mask, SYSCISR_DELAY_US, + SYSCISR_TIMEOUT); + if (ret) ret = -EIO; iowrite32(isr_mask, rcar_sysc_base + SYSCISCR); -- 2.25.1 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 62A54C433DB for ; Mon, 25 Jan 2021 14:28:12 +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 19DB722B3B for ; Mon, 25 Jan 2021 14:28:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19DB722B3B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be 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: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:In-Reply-To:References:List-Owner; bh=HgSxZV8GPB0xoY2m+kEVnzC9Ba7E+GIQ/Ea4hWDrrJM=; b=V3IY2cq7AcwS4bUTLt3zIWfpIo KiDWtfgmdWq13ZjX7/hGr3PavKD7TTRPOg30P+AEb9aN9pkafy+wa907X86mjDcB2X8tV2zqetIB+ lcf8FfC0d0UgODVLy69GaHP3pyOoURO7fCkAGyBScyXCEO7Z1IGhGiGXbmtbEdJWvJDhRGlQ95MCY I5Tm4jbqSxW4ALGYA7eA3u2V/dmLvtG1JK2PgLH6mjMptcAtjB3u5uQGQIPwCkzbJK1fBhDNgexMN 5GMxv6dTsYqoljxASWDqQXa/kT/O0F+HrRY2JTHKnaWJ2VW8Eh7Cep9UlI/g9ROoI/9grOEA9xLET cs0z6+iQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l42ow-0004nw-Lb; Mon, 25 Jan 2021 14:26:22 +0000 Received: from baptiste.telenet-ops.be ([2a02:1800:120:4::f00:13]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l42os-0004mo-GC for linux-arm-kernel@lists.infradead.org; Mon, 25 Jan 2021 14:26:20 +0000 Received: from ramsan.of.borg ([84.195.186.194]) by baptiste.telenet-ops.be with bizsmtp id M2S82400F4C55Sk012S8YN; Mon, 25 Jan 2021 15:26:11 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1l42oi-000ej3-1n; Mon, 25 Jan 2021 15:26:08 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1l42oh-004PCO-GS; Mon, 25 Jan 2021 15:26:07 +0100 From: Geert Uytterhoeven To: Magnus Damm Subject: [PATCH v2] soc: renesas: rcar-sysc: Use readl_poll_timeout_atomic() Date: Mon, 25 Jan 2021 15:26:06 +0100 Message-Id: <20210125142606.1050130-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210125_092618_644443_1B9ABB80 X-CRM114-Status: GOOD ( 14.24 ) 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: linux-renesas-soc@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Yoshihiro Shimoda , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org UmVwbGFjZSB0aGUgb3Blbi1jb2RlZCBwb2xsaW5nIGxvb3BzIGJ5IGNhbGxzIHRvIHRoZQpyZWFk bF9wb2xsX3RpbWVvdXRfYXRvbWljKCkgaGVscGVyIG1hY3JvLgoKU2lnbmVkLW9mZi1ieTogR2Vl cnQgVXl0dGVyaG9ldmVuIDxnZWVydCtyZW5lc2FzQGdsaWRlci5iZT4KUmV2aWV3ZWQtYnk6IE5p a2xhcyBTw7ZkZXJsdW5kIDxuaWtsYXMuc29kZXJsdW5kK3JlbmVzYXNAcmFnbmF0ZWNoLnNlPgot LS0KVG8gYmUgcXVldWVkIGluIHJlbmVzYXMtZGV2ZWwgZm9yIHY1LjEyLgoKdjI6CiAgLSBBZGQg UmV2aWV3ZWQtYnksCiAgLSBNYWtlICJrIiB1bnNpZ25lZC4KLS0tCiBkcml2ZXJzL3NvYy9yZW5l c2FzL3JjYXItc3lzYy5jIHwgMzUgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9zb2MvcmVuZXNhcy9yY2FyLXN5c2MuYyBiL2RyaXZlcnMvc29jL3JlbmVz YXMvcmNhci1zeXNjLmMKaW5kZXggYTAwYmIwOThlMWZlNzQ4OC4uNTMzODdhNzJjYTAwY2U3OSAx MDA2NDQKLS0tIGEvZHJpdmVycy9zb2MvcmVuZXNhcy9yY2FyLXN5c2MuYworKysgYi9kcml2ZXJz L3NvYy9yZW5lc2FzL3JjYXItc3lzYy5jCkBAIC0xNSw2ICsxNSw3IEBACiAjaW5jbHVkZSA8bGlu dXgvc2xhYi5oPgogI2luY2x1ZGUgPGxpbnV4L3NwaW5sb2NrLmg+CiAjaW5jbHVkZSA8bGludXgv aW8uaD4KKyNpbmNsdWRlIDxsaW51eC9pb3BvbGwuaD4KICNpbmNsdWRlIDxsaW51eC9zb2MvcmVu ZXNhcy9yY2FyLXN5c2MuaD4KIAogI2luY2x1ZGUgInJjYXItc3lzYy5oIgpAQCAtNDQsMTMgKzQ1 LDEzIEBACiAjZGVmaW5lIFBXUkVSX09GRlMJCTB4MTQJLyogUG93ZXIgU2h1dG9mZi9SZXN1bWUg RXJyb3IgKi8KIAogCi0jZGVmaW5lIFNZU0NTUl9SRVRSSUVTCQkxMDAKKyNkZWZpbmUgU1lTQ1NS X1RJTUVPVVQJCTEwMAogI2RlZmluZSBTWVNDU1JfREVMQVlfVVMJCTEKIAogI2RlZmluZSBQV1JF Ul9SRVRSSUVTCQkxMDAKICNkZWZpbmUgUFdSRVJfREVMQVlfVVMJCTEKIAotI2RlZmluZSBTWVND SVNSX1JFVFJJRVMJCTEwMDAKKyNkZWZpbmUgU1lTQ0lTUl9USU1FT1VUCQkxMDAwCiAjZGVmaW5l IFNZU0NJU1JfREVMQVlfVVMJMQogCiAjZGVmaW5lIFJDQVJfUERfQUxXQVlTX09OCTMyCS8qIEFs d2F5cy1vbiBwb3dlciBhcmVhICovCkBAIC02OCw3ICs2OSw4IEBAIHN0YXRpYyB1MzIgcmNhcl9z eXNjX2V4dG1hc2tfb2ZmcywgcmNhcl9zeXNjX2V4dG1hc2tfdmFsOwogc3RhdGljIGludCByY2Fy X3N5c2NfcHdyX29uX29mZihjb25zdCBzdHJ1Y3QgcmNhcl9zeXNjX2NoICpzeXNjX2NoLCBib29s IG9uKQogewogCXVuc2lnbmVkIGludCBzcl9iaXQsIHJlZ19vZmZzOwotCWludCBrOworCXUzMiB2 YWw7CisJaW50IHJldDsKIAogCWlmIChvbikgewogCQlzcl9iaXQgPSBTWVNDU1JfUE9ORU5COwpA QCAtNzksMTMgKzgxLDEwIEBAIHN0YXRpYyBpbnQgcmNhcl9zeXNjX3B3cl9vbl9vZmYoY29uc3Qg c3RydWN0IHJjYXJfc3lzY19jaCAqc3lzY19jaCwgYm9vbCBvbikKIAl9CiAKIAkvKiBXYWl0IHVu dGlsIFNZU0MgaXMgcmVhZHkgdG8gYWNjZXB0IGEgcG93ZXIgcmVxdWVzdCAqLwotCWZvciAoayA9 IDA7IGsgPCBTWVNDU1JfUkVUUklFUzsgaysrKSB7Ci0JCWlmIChpb3JlYWQzMihyY2FyX3N5c2Nf YmFzZSArIFNZU0NTUikgJiBCSVQoc3JfYml0KSkKLQkJCWJyZWFrOwotCQl1ZGVsYXkoU1lTQ1NS X0RFTEFZX1VTKTsKLQl9Ci0KLQlpZiAoayA9PSBTWVNDU1JfUkVUUklFUykKKwlyZXQgPSByZWFk bF9wb2xsX3RpbWVvdXRfYXRvbWljKHJjYXJfc3lzY19iYXNlICsgU1lTQ1NSLCB2YWwsCisJCQkJ CXZhbCAmIEJJVChzcl9iaXQpLCBTWVNDU1JfREVMQVlfVVMsCisJCQkJCVNZU0NTUl9USU1FT1VU KTsKKwlpZiAocmV0KQogCQlyZXR1cm4gLUVBR0FJTjsKIAogCS8qIFN1Ym1pdCBwb3dlciBzaHV0 b2ZmIG9yIHBvd2VyIHJlc3VtZSByZXF1ZXN0ICovCkBAIC05OSwxMCArOTgsOSBAQCBzdGF0aWMg aW50IHJjYXJfc3lzY19wb3dlcihjb25zdCBzdHJ1Y3QgcmNhcl9zeXNjX2NoICpzeXNjX2NoLCBi b29sIG9uKQogewogCXVuc2lnbmVkIGludCBpc3JfbWFzayA9IEJJVChzeXNjX2NoLT5pc3JfYml0 KTsKIAl1bnNpZ25lZCBpbnQgY2hhbl9tYXNrID0gQklUKHN5c2NfY2gtPmNoYW5fYml0KTsKLQl1 bnNpZ25lZCBpbnQgc3RhdHVzOworCXVuc2lnbmVkIGludCBzdGF0dXMsIGs7CiAJdW5zaWduZWQg bG9uZyBmbGFnczsKLQlpbnQgcmV0ID0gMDsKLQlpbnQgazsKKwlpbnQgcmV0OwogCiAJc3Bpbl9s b2NrX2lycXNhdmUoJnJjYXJfc3lzY19sb2NrLCBmbGFncyk7CiAKQEAgLTE0NSwxMyArMTQzLDEw IEBAIHN0YXRpYyBpbnQgcmNhcl9zeXNjX3Bvd2VyKGNvbnN0IHN0cnVjdCByY2FyX3N5c2NfY2gg KnN5c2NfY2gsIGJvb2wgb24pCiAJfQogCiAJLyogV2FpdCB1bnRpbCB0aGUgcG93ZXIgc2h1dG9m ZiBvciByZXN1bWUgcmVxdWVzdCBoYXMgY29tcGxldGVkICogKi8KLQlmb3IgKGsgPSAwOyBrIDwg U1lTQ0lTUl9SRVRSSUVTOyBrKyspIHsKLQkJaWYgKGlvcmVhZDMyKHJjYXJfc3lzY19iYXNlICsg U1lTQ0lTUikgJiBpc3JfbWFzaykKLQkJCWJyZWFrOwotCQl1ZGVsYXkoU1lTQ0lTUl9ERUxBWV9V Uyk7Ci0JfQotCi0JaWYgKGsgPT0gU1lTQ0lTUl9SRVRSSUVTKQorCXJldCA9IHJlYWRsX3BvbGxf dGltZW91dF9hdG9taWMocmNhcl9zeXNjX2Jhc2UgKyBTWVNDSVNSLCBzdGF0dXMsCisJCQkJCXN0 YXR1cyAmIGlzcl9tYXNrLCBTWVNDSVNSX0RFTEFZX1VTLAorCQkJCQlTWVNDSVNSX1RJTUVPVVQp OworCWlmIChyZXQpCiAJCXJldCA9IC1FSU87CiAKIAlpb3dyaXRlMzIoaXNyX21hc2ssIHJjYXJf c3lzY19iYXNlICsgU1lTQ0lTQ1IpOwotLSAKMi4yNS4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=