From patchwork Tue Aug 22 15:25:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 13361088 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59772EE49A3 for ; Tue, 22 Aug 2023 15:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=f/6mV5QeHS/B0HqV0Y1aUwBjMyQqINghGaR69nAoG88=; b=fB1hYm107xf2kQ mgS76ipZlTgTkKlbij96aERS7ItZ7yXdg0Pp5+BXxOH9KfEE7qQMkgVjDLcP7i91MpD/ohTttgMYH R0kOX1oTDwsgmwW3L1RGgeYVdCE7vVk2J+rUiG4n4mWUrNGG72Ji+U/vFunh6RUbCrxdYXgnd4e0w qFXD6Pn60GMdwUyz7Huo3Qlasb/q3bXb341eNnGNcxKPzxjS/4hu0mK58+Uv9WjJGpYwApWrlyKzc rEBuqTyUXQunTw1ZNAsnfN5X61Ml3rHbb3TZGlqOmoBE6G6QGDiFFhO3NydZnWMXXERYCWzJ4tDIE 07Li9tZIaKyi2DmHDgeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYTJC-00GMrL-1g; Tue, 22 Aug 2023 15:28:42 +0000 Received: from viti.kaiser.cx ([2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYTJ9-00GMoL-0T for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2023 15:28:40 +0000 Received: from pd956d63d.dip0.t-ipconnect.de ([217.86.214.61] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1qYTJ3-0006li-UF; Tue, 22 Aug 2023 17:28:34 +0200 From: Martin Kaiser To: Herbert Xu Cc: linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 1/3] hwrng: imx-rngc - use polling to detect end of self test Date: Tue, 22 Aug 2023 17:25:51 +0200 Message-Id: <20230822152553.190858-2-martin@kaiser.cx> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230822152553.190858-1-martin@kaiser.cx> References: <20230822152553.190858-1-martin@kaiser.cx> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_082839_327789_54D468C4 X-CRM114-Status: GOOD ( 13.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use polling to detect the end of the rngc self test. This is much simpler than using an interrupt and a completion. Active waiting is no disadvantage here. The self test is run during probe, there's nothing we could do in parallel at this time. Signed-off-by: Martin Kaiser --- drivers/char/hw_random/imx-rngc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/char/hw_random/imx-rngc.c b/drivers/char/hw_random/imx-rngc.c index e4b385b01b11..85207535fd12 100644 --- a/drivers/char/hw_random/imx-rngc.c +++ b/drivers/char/hw_random/imx-rngc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #define RNGC_VER_ID 0x0000 @@ -101,21 +102,19 @@ static inline void imx_rngc_irq_unmask(struct imx_rngc *rngc) static int imx_rngc_self_test(struct imx_rngc *rngc) { - u32 cmd; + u32 cmd, status; int ret; - imx_rngc_irq_unmask(rngc); - /* run self test */ cmd = readl(rngc->base + RNGC_COMMAND); writel(cmd | RNGC_CMD_SELF_TEST, rngc->base + RNGC_COMMAND); - ret = wait_for_completion_timeout(&rngc->rng_op_done, msecs_to_jiffies(RNGC_TIMEOUT)); - imx_rngc_irq_mask_clear(rngc); - if (!ret) - return -ETIMEDOUT; + ret = readl_poll_timeout(rngc->base + RNGC_STATUS, status, + status & RNGC_STATUS_ST_DONE, 1000, RNGC_TIMEOUT * 1000); + if (ret < 0) + return ret; - return rngc->err_reg ? -EIO : 0; + return readl(rngc->base + RNGC_ERROR) ? -EIO : 0; } static int imx_rngc_read(struct hwrng *rng, void *data, size_t max, bool wait)