From patchwork Thu Apr 27 18:53:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 88369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp483749vqo; Thu, 27 Apr 2023 12:23:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5DLEGc81ishqCgMNMLW+Jg/oRk2cdkevvNj3krUq1AyA5ZyfZS7iBKzY3IoMM2w7euYCJM X-Received: by 2002:a17:90b:1649:b0:24c:5e6:7035 with SMTP id il9-20020a17090b164900b0024c05e67035mr2875692pjb.30.1682623415714; Thu, 27 Apr 2023 12:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682623415; cv=none; d=google.com; s=arc-20160816; b=XHB+Erkm7q1ba9kZ0FjLmgXTrGIA07lneTRXvsDsDLgY1OpMuDNn4uNp7aPRkP+8sv 7s18SSe/916ZfMNAS82DHpj5R4YZDizhy72Y4dWVDJvrzRiCTQj1PYfnpU+9VFHTLsAb 5G+GDi+3O/AfiZCJUOyyO8IzaxEsoPejchf05RUJMbYYKNJHB2BkfSixIdtgeWrjUeqx RmF08QO7ybiUh1OxfGuh5HD1KXjNkrbLIZ8317K8zwlI9599QbcUUc31oykgMKStLeOX 2LhestmtkvMRQPpGMfk2ZOWlZDo0YQUzhj03U3WPmK9a1PVLmMnw+idrmhl5FcaUZF+O yFVQ== 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; bh=P8+SFoJqzVzdbYGPatIdgSQiQRONNeakg88oiaw0JR4=; b=hDTP68UMiYCcvew1Y+eAZStHgH0tJLU/4LYo2lhcgOXbXGfXKv4DJYnVjAMJ0aH60j gRYLrt+4T6ZRAyc0WrWlC7LtM4cz1JIRWzfdrZK8IIrQSjHdc3FtnRAfS5r/pVaAfcEC 2/Ds/Lc+T+7zxbcqAf7FQvn3pkEgGHqOK47BEuhhxIyrijB19PDFHLmmg7L5kqsbgmc0 Sj+wFg0ULRWiIrtthfRJ0jymYICcVnZe0sc6aE4GR0EpmuIMN+r73h1oQgbAii7dpWCf 20y69KQLv+WHymjJ9L0FpjW7E70zqVMTYxvifgGLii3glC2TDpQZgxSTA3dB/kZi3kaH /lAQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q17-20020a635c11000000b0051909d663desi18835055pgb.481.2023.04.27.12.23.20; Thu, 27 Apr 2023 12:23:35 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244668AbjD0TIf (ORCPT + 99 others); Thu, 27 Apr 2023 15:08:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244664AbjD0TIc (ORCPT ); Thu, 27 Apr 2023 15:08:32 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F72049DA; Thu, 27 Apr 2023 12:08:10 -0700 (PDT) Received: from ipservice-092-217-081-249.092.217.pools.vodafone-ip.de ([92.217.81.249] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1ps6l4-0003RX-PD; Thu, 27 Apr 2023 20:54:22 +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 bitfield macros to read fifo level Date: Thu, 27 Apr 2023 20:53:55 +0200 Message-Id: <20230427185357.923412-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230427185357.923412-1-martin@kaiser.cx> References: <20230427185357.923412-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1764358530769635749?= X-GMAIL-MSGID: =?utf-8?q?1764358530769635749?= Use the mechanism from bitfield.h to read the fifo level field in the status register. This makes the code a tiny bit simpler. Signed-off-by: Martin Kaiser --- drivers/char/hw_random/imx-rngc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/char/hw_random/imx-rngc.c b/drivers/char/hw_random/imx-rngc.c index a1c24148ed31..861a615ac7df 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 #define RNGC_VER_ID 0x0000 #define RNGC_COMMAND 0x0004 @@ -44,8 +45,7 @@ #define RNGC_CTRL_AUTO_SEED 0x00000010 #define RNGC_STATUS_ERROR 0x00010000 -#define RNGC_STATUS_FIFO_LEVEL_MASK 0x00000f00 -#define RNGC_STATUS_FIFO_LEVEL_SHIFT 8 +#define RNGC_STATUS_FIFO_LEVEL GENMASK(11, 8) #define RNGC_STATUS_SEED_DONE 0x00000020 #define RNGC_STATUS_ST_DONE 0x00000010 @@ -133,9 +133,7 @@ static int imx_rngc_read(struct hwrng *rng, void *data, size_t max, bool wait) break; /* how many random numbers are in FIFO? [0-16] */ - level = (status & RNGC_STATUS_FIFO_LEVEL_MASK) >> - RNGC_STATUS_FIFO_LEVEL_SHIFT; - + level = FIELD_GET(RNGC_STATUS_FIFO_LEVEL, status); if (level) { /* retrieve a random number from FIFO */ *(u32 *)data = readl(rngc->base + RNGC_FIFO);