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.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 3B03CC2BB48 for ; Mon, 14 Dec 2020 18:00:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BC6022509 for ; Mon, 14 Dec 2020 18:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408201AbgLNR7s (ORCPT ); Mon, 14 Dec 2020 12:59:48 -0500 Received: from lpdvacalvio01.broadcom.com ([192.19.229.182]:36328 "EHLO relay.smtp-ext.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408014AbgLNR7m (ORCPT ); Mon, 14 Dec 2020 12:59:42 -0500 Received: from [10.136.13.65] (lbrmn-lnxub113.ric.broadcom.net [10.136.13.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id 2703080F3; Mon, 14 Dec 2020 09:50:25 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 2703080F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1607968225; bh=FiZzrokXj/Wcz9DvgJNMcsRGqr2Epz7xd7OEyplP+kI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=YhwbyxPDbVluUt0jw+MkgNcmo8BJzWqtLGGnZgKS8TIbpcS+9UhDOT+P3MrSA/jOi uJme6kd9L5o0Xeo2F5RdoAy4z4RST2ZeubkzBvXjvNqdaLfFXhIpwZ3oNKhJRBY7Cg oSWJZhyuJDKsnIQa0NlIs2z2uRNqeiP3BliYOna4= Subject: Re: [PATCH 2/2] hwrng: iproc-rng200: Move enable/disable in separate function To: matthias.bgg@kernel.org, mpm@selenic.com, herbert@gondor.apana.org.au, rjui@broadcom.com, sbranden@broadcom.com, f.fainelli@gmail.com Cc: linux-kernel@vger.kernel.org, Julia.Lawall@inria.fr, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, nsaenzjulienne@suse.de, linux-crypto@vger.kernel.org, Matthias Brugger References: <20201214160454.22769-1-matthias.bgg@kernel.org> <20201214160454.22769-2-matthias.bgg@kernel.org> From: Scott Branden Message-ID: <9f87ad0f-b281-33f4-b81d-e62a37d536fc@broadcom.com> Date: Mon, 14 Dec 2020 09:50:24 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201214160454.22769-2-matthias.bgg@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-CA Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On 2020-12-14 8:04 a.m., matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > We are calling the same code for enable and disable the block in various > parts of the driver. Put that code into a new function to reduce code > duplication. Patch needs to be regenerated after most of PATCH 1 dropped. > > Signed-off-by: Matthias Brugger > > --- > > drivers/char/hw_random/iproc-rng200.c | 37 ++++++++++++--------------- > 1 file changed, 17 insertions(+), 20 deletions(-) > > diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c > index e106ce3c0146..3367b26085e8 100644 > --- a/drivers/char/hw_random/iproc-rng200.c > +++ b/drivers/char/hw_random/iproc-rng200.c > @@ -53,15 +53,26 @@ struct iproc_rng200_dev { > > #define to_rng_priv(rng) container_of(rng, struct iproc_rng200_dev, rng) > > -static void iproc_rng200_restart(void __iomem *rng_base) > +static void iproc_rng200_enable(void __iomem *rng_base, bool enable) > { > uint32_t val; > > - /* Disable RBG */ > val = ioread32(rng_base + RNG_CTRL_OFFSET); > val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > + > + if (enable) > + val |= RNG_CTRL_RNG_RBGEN_ENABLE; > + else > + val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > + > iowrite32(val, rng_base + RNG_CTRL_OFFSET); > +} > + > +static void iproc_rng200_restart(void __iomem *rng_base) > +{ > + uint32_t val; > + > + iproc_rng200_enable(rng_base, false); > > /* Clear all interrupt status */ > iowrite32(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET); > @@ -83,11 +94,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) > val &= ~RBG_SOFT_RESET; > iowrite32(val, rng_base + RBG_SOFT_RESET_OFFSET); > > - /* Enable RBG */ > - val = ioread32(rng_base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val |= RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, rng_base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(rng_base, true); > } > > static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max, > @@ -154,13 +161,8 @@ static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max, > static int iproc_rng200_init(struct hwrng *rng) > { > struct iproc_rng200_dev *priv = to_rng_priv(rng); > - uint32_t val; > > - /* Setup RNG. */ > - val = ioread32(priv->base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val |= RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, priv->base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(priv->base, true); > > return 0; > } > @@ -168,13 +170,8 @@ static int iproc_rng200_init(struct hwrng *rng) > static void iproc_rng200_cleanup(struct hwrng *rng) > { > struct iproc_rng200_dev *priv = to_rng_priv(rng); > - uint32_t val; > > - /* Disable RNG hardware */ > - val = ioread32(priv->base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, priv->base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(priv->base, false); > } > > static int iproc_rng200_probe(struct platform_device *pdev) 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=-15.3 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,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 9C960C4361B for ; Mon, 14 Dec 2020 17:51:55 +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 654B121534 for ; Mon, 14 Dec 2020 17:51:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 654B121534 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=broadcom.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:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6jQEcw5MnQBgCG6J4illUghqETMwc3lnuFDNFQ3HFXQ=; b=yWFQyDsytRmfThiiCb6LMVaYq 5ai65KSnQ6G7fe8+MI0QvTx3baai+qHPY/W4cYlL3dKj+xWfiaGsag+lE8MY+4bAc5WeUYTmY5T/z 2/l9OwoWemd4IBy9MGLjxw110HTB6+RiR23AwWfPmqrCRCOV1qc0pSTki88DjrQuLYcPCPvx3f9La 9jp5SFkjieBA5zdB2ir6riBCbtr+hnV2UfG6OLo62VAR/pxg5jE0IKOFDftZHtsVm5hzYR3wz0VUm Kf/J+CFdkHfMXAFIHkp7Fmv5ROJBQQryY6d7F2CRxiOEG9qyIvT3gE+wsmkPLbAyq46l3hYZCgivn M13dGWPAg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1korzX-00030w-AY; Mon, 14 Dec 2020 17:50:35 +0000 Received: from lpdvacalvio01.broadcom.com ([192.19.229.182] helo=relay.smtp-ext.broadcom.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1korzO-0002x9-LQ for linux-arm-kernel@lists.infradead.org; Mon, 14 Dec 2020 17:50:30 +0000 Received: from [10.136.13.65] (lbrmn-lnxub113.ric.broadcom.net [10.136.13.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id 2703080F3; Mon, 14 Dec 2020 09:50:25 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 2703080F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1607968225; bh=FiZzrokXj/Wcz9DvgJNMcsRGqr2Epz7xd7OEyplP+kI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=YhwbyxPDbVluUt0jw+MkgNcmo8BJzWqtLGGnZgKS8TIbpcS+9UhDOT+P3MrSA/jOi uJme6kd9L5o0Xeo2F5RdoAy4z4RST2ZeubkzBvXjvNqdaLfFXhIpwZ3oNKhJRBY7Cg oSWJZhyuJDKsnIQa0NlIs2z2uRNqeiP3BliYOna4= Subject: Re: [PATCH 2/2] hwrng: iproc-rng200: Move enable/disable in separate function To: matthias.bgg@kernel.org, mpm@selenic.com, herbert@gondor.apana.org.au, rjui@broadcom.com, sbranden@broadcom.com, f.fainelli@gmail.com References: <20201214160454.22769-1-matthias.bgg@kernel.org> <20201214160454.22769-2-matthias.bgg@kernel.org> From: Scott Branden Message-ID: <9f87ad0f-b281-33f4-b81d-e62a37d536fc@broadcom.com> Date: Mon, 14 Dec 2020 09:50:24 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201214160454.22769-2-matthias.bgg@kernel.org> Content-Language: en-CA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201214_125026_897203_4569F0F1 X-CRM114-Status: GOOD ( 22.09 ) 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: Matthias Brugger , linux-kernel@vger.kernel.org, Julia.Lawall@inria.fr, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, nsaenzjulienne@suse.de, linux-crypto@vger.kernel.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 On 2020-12-14 8:04 a.m., matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > We are calling the same code for enable and disable the block in various > parts of the driver. Put that code into a new function to reduce code > duplication. Patch needs to be regenerated after most of PATCH 1 dropped. > > Signed-off-by: Matthias Brugger > > --- > > drivers/char/hw_random/iproc-rng200.c | 37 ++++++++++++--------------- > 1 file changed, 17 insertions(+), 20 deletions(-) > > diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c > index e106ce3c0146..3367b26085e8 100644 > --- a/drivers/char/hw_random/iproc-rng200.c > +++ b/drivers/char/hw_random/iproc-rng200.c > @@ -53,15 +53,26 @@ struct iproc_rng200_dev { > > #define to_rng_priv(rng) container_of(rng, struct iproc_rng200_dev, rng) > > -static void iproc_rng200_restart(void __iomem *rng_base) > +static void iproc_rng200_enable(void __iomem *rng_base, bool enable) > { > uint32_t val; > > - /* Disable RBG */ > val = ioread32(rng_base + RNG_CTRL_OFFSET); > val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > + > + if (enable) > + val |= RNG_CTRL_RNG_RBGEN_ENABLE; > + else > + val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > + > iowrite32(val, rng_base + RNG_CTRL_OFFSET); > +} > + > +static void iproc_rng200_restart(void __iomem *rng_base) > +{ > + uint32_t val; > + > + iproc_rng200_enable(rng_base, false); > > /* Clear all interrupt status */ > iowrite32(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET); > @@ -83,11 +94,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) > val &= ~RBG_SOFT_RESET; > iowrite32(val, rng_base + RBG_SOFT_RESET_OFFSET); > > - /* Enable RBG */ > - val = ioread32(rng_base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val |= RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, rng_base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(rng_base, true); > } > > static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max, > @@ -154,13 +161,8 @@ static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max, > static int iproc_rng200_init(struct hwrng *rng) > { > struct iproc_rng200_dev *priv = to_rng_priv(rng); > - uint32_t val; > > - /* Setup RNG. */ > - val = ioread32(priv->base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val |= RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, priv->base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(priv->base, true); > > return 0; > } > @@ -168,13 +170,8 @@ static int iproc_rng200_init(struct hwrng *rng) > static void iproc_rng200_cleanup(struct hwrng *rng) > { > struct iproc_rng200_dev *priv = to_rng_priv(rng); > - uint32_t val; > > - /* Disable RNG hardware */ > - val = ioread32(priv->base + RNG_CTRL_OFFSET); > - val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > - iowrite32(val, priv->base + RNG_CTRL_OFFSET); > + iproc_rng200_enable(priv->base, false); > } > > static int iproc_rng200_probe(struct platform_device *pdev) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel