From patchwork Wed Nov 8 00:44:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10047415 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6DCDF603FF for ; Wed, 8 Nov 2017 00:45:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60FCA2A19A for ; Wed, 8 Nov 2017 00:45:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54EAF2A1C0; Wed, 8 Nov 2017 00:45:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB5E62A19A for ; Wed, 8 Nov 2017 00:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758906AbdKHApJ (ORCPT ); Tue, 7 Nov 2017 19:45:09 -0500 Received: from mail-qk0-f193.google.com ([209.85.220.193]:54099 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758901AbdKHApG (ORCPT ); Tue, 7 Nov 2017 19:45:06 -0500 Received: by mail-qk0-f193.google.com with SMTP id y23so1370796qkb.10; Tue, 07 Nov 2017 16:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GBmTCj3eHQvnUuuxFY8PrIwroiknN2fYZWRBz4dwb8w=; b=qo5Ix2MX6w/1jFm+FQExs4zBMqerVoJ0Lm4gXKWdqmDn1GJjaJ7hSi24HaXAziF48j bny0JFN72A1G9NeLOB3evLRlFVRLv0JlzV6KAJDgMdFjvtQxCzvSJJbOEhI7UrvqW1Qj bCfl/TrtXbtYKEbJ5Ggj2uTk7mhalMnY7J9tGBbf91KBIurgfKh63xDcDJMxjjsW1NRw TZY9QsK2j+7Y8wZ1i7KVuSrmMQKv5pIA/GjKSeCWIqADV97fUGkBEjXAU1hZYWLzK4eh sw6pM5DPHPtu1wCo/7c//9YW0O2qUTmC6tMLgvb85m0BnW4jEDuNfeFld5HIm4ni5x9X D3Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GBmTCj3eHQvnUuuxFY8PrIwroiknN2fYZWRBz4dwb8w=; b=XfpyE6Q49Kkr1+clapbVUvGkuFmX4Ns4YyY3nuIMpgMxbVqntx7sA19ZxuzYfb6TH4 Lp/0SGhX6ve/f5Dqe3RS6dsbRoIcYf6DSD/4BjGruNWXLSzEuDdUYCTQkW3ox/6kZg03 X/er2prrGIGd4foCEmKIqCCOo+w2rrvfhoMrflmP0oaYIQKgO8zJ62i8aQTHqoSVsG/u s5hgPGMyb7/aHweQrAefMM2XTvqRpRwROpKiIcX5IhuN/oreZQAci/24IAx3EEfSpEoy kkPa4t7r+pouubz4xp44hgIMrYsA+6+GDL33W/4YuV5KXw9n6boFQI9em93FlLAbymAF o6JA== X-Gm-Message-State: AJaThX5d9ffHyf6QZwmnE5x+iDN73/dKjiNR1kt0z2GMQ97opKPrrdiX sPp9gskKSpGw+KVI71U6+NxSN9mL X-Google-Smtp-Source: AGs4zMYlZ5tCAW2m2c7ZXM74jp54qH10CgKN8MML/5JETwPFjvTYOSm5IkswHG4M+6u9c+JxsMsXXg== X-Received: by 10.55.186.196 with SMTP id k187mr883975qkf.94.1510101904270; Tue, 07 Nov 2017 16:45:04 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id y9sm1862407qth.43.2017.11.07.16.45.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Nov 2017 16:45:03 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Matt Mackall , Herbert Xu , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Eric Anholt , Stefan Wahren , PrasannaKumar Muralidharan , Russell King , Krzysztof Kozlowski , Harald Freudenberger , Sean Wang , Martin Kaiser , Steffen Trumtrar , linux-crypto@vger.kernel.org (open list:HARDWARE RANDOM NUMBER GENERATOR CORE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE) Subject: [PATCH v2 03/12] hwrng: bcm2835-rng: Move enabling to hwrng::init Date: Tue, 7 Nov 2017 16:44:40 -0800 Message-Id: <20171108004449.32730-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171108004449.32730-1-f.fainelli@gmail.com> References: <20171108004449.32730-1-f.fainelli@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We should be moving the enabling of the HWRNG into a hwrng::init callback since we can be disabled and enabled every time a different hwrng is selected in the system. Signed-off-by: Florian Fainelli --- drivers/char/hw_random/bcm2835-rng.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 0d72147ab45b..82000a637504 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -72,6 +72,17 @@ static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max, return num_words * sizeof(u32); } +static int bcm2835_rng_init(struct hwrng *rng) +{ + struct bcm2835_rng_priv *priv = to_rng_priv(rng); + + /* set warm-up count & enable */ + __raw_writel(RNG_WARMUP_COUNT, priv->base + RNG_STATUS); + __raw_writel(RNG_RBGEN, priv->base + RNG_CTRL); + + return 0; +} + static const struct of_device_id bcm2835_rng_of_match[] = { { .compatible = "brcm,bcm2835-rng"}, { .compatible = "brcm,bcm-nsp-rng", .data = nsp_rng_init}, @@ -105,6 +116,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev) } priv->rng.name = "bcm2835-rng"; + priv->rng.init = bcm2835_rng_init; priv->rng.read = bcm2835_rng_read; rng_id = of_match_node(bcm2835_rng_of_match, np); @@ -116,10 +128,6 @@ static int bcm2835_rng_probe(struct platform_device *pdev) if (rng_setup) rng_setup(priv->base); - /* set warm-up count & enable */ - __raw_writel(RNG_WARMUP_COUNT, priv->base + RNG_STATUS); - __raw_writel(RNG_RBGEN, priv->base + RNG_CTRL); - /* register driver */ err = hwrng_register(&priv->rng); if (err)