From patchwork Thu Nov 2 01:04:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10037847 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 A2773602A0 for ; Thu, 2 Nov 2017 01:19:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96B022861E for ; Thu, 2 Nov 2017 01:19:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8973A28619; Thu, 2 Nov 2017 01:19:28 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D771228619 for ; Thu, 2 Nov 2017 01:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=+hdQetseD0uYjOD0CjabBGgvLUONp2qvXajr/R1tvLM=; b=tFlk1Ocw6hjZdRUq8JMabTVWTx oSqnJDGHKDL9iTcouIhzN/KLZ1poOjn03VegXNwTSzwHaQChm3Icjnd6VV3xjjOumGh/GBfFhI70B fYJ7u2GGuOox383Jecsjplj+VUsvmNZHyEi7iZNSPgeLVqI5wDpq7B30HRFubcGjkDzgmf6+jLWUE ZDso3dSW6e9oyk1Fq42iiXqLc4F1zSdpQTVSpQdBcJXOY3HR8MEe+X5moYtoHsZ2CbveK7DofFA4m 1/+M8bYbHkf5yWlOlK6cBT4K0eqCyZbf55KbZgduvxgFtJ1nSe3lPGMuojhsatHa3VNex5C+Kaxb5 7nru4mmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eA4AJ-00065D-Ij; Thu, 02 Nov 2017 01:19:27 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eA3w6-0001JP-DK; Thu, 02 Nov 2017 01:04:48 +0000 Received: by mail-pg0-x241.google.com with SMTP id j3so3600953pga.1; Wed, 01 Nov 2017 18:04:26 -0700 (PDT) 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=WrnBm9Pn9jBL1Yqv4BevW0skSAo4UF9k/oVdWaRmiQc=; b=ptHTFdk2FDeKnbWaJIThW5dXBNFPZcmohwMSEBmOZG/QVKJCFM+8O9SVydMZ9XQ76B GPyDi1+4Xw3aUjy9uniRmg0m9ycbFG3OGJmuptdDQKx0VsW0WK0Ok/RHC6ZdKymo8ri6 Ai8uVYUa8gSOLXayXatLuzD3HbcpkA1pJ364Ie1ii/jZSFDDWDKMitPALpsQPIEw/5Dv AfnePlN3QcMgvA8wCBAiX/M1GWhEsMyuC/qXHeEzpiVeCARX9tmgh0O78lI5epx/BznV i2j6JukPDr7j/aFuKbMltB5lUxEgVfrMNgJko3MFeU6oDajgCIOl6/aL9hCx1EnCfaJd GR+w== 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=WrnBm9Pn9jBL1Yqv4BevW0skSAo4UF9k/oVdWaRmiQc=; b=UXPirHwZoZLSqk4aZGrSzVens/OHeQynUWZ7TXqTmS8xSfr3wSANJrJ1pq3saSQEQA BHUNPICi4qt4v8uIl6tvBJHx6VJVUsV6QYzfoHI2pJb1pRlcAMNu4hAYqhnScMBmuNeX HA+0GjAFp1rRQe9G74dLVNP6BXdU381YleeWKlvSgle2BKkSXs8xedVGtCuuW/W4P46o Y/WjypLVonG9iWu5lrpJ80VnIEi5KLcZtcUQMH/3yv+39EZE/FVVMr2SBxaKL4LNWWCy g/iSvyypdp88spSuu6yXWya9d9gSI9rWKLpqFm27LreuwAIxWehhgNEnjiCzAd+smDJw b2BQ== X-Gm-Message-State: AMCzsaUsWZ8erwncLF/fDrQf3lQdvgP71UHmG6/zjyDtgZj/XvVdrOEb diDmiPsyex/VaFSY7DfvZkQ= X-Google-Smtp-Source: ABhQp+TXTArwU3Nhu4iSuNVBBcY09s+8z4OLP3fE3TjMULXgCUPBKNyHX1c/LBpplX7HXsOm0AKTjw== X-Received: by 10.84.215.157 with SMTP id l29mr1412210pli.181.1509584665676; Wed, 01 Nov 2017 18:04:25 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id x19sm3032339pgc.60.2017.11.01.18.04.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Nov 2017 18:04:24 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Subject: [PATCH 04/12] hwrng: bcm2835-rng: Implementation cleanup callback Date: Wed, 1 Nov 2017 18:04:00 -0700 Message-Id: <20171102010408.27736-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171102010408.27736-1-f.fainelli@gmail.com> References: <20171102010408.27736-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171101_180446_613101_48236337 X-CRM114-Status: GOOD ( 11.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Stefan Wahren , Florian Fainelli , Martin Kaiser , Herbert Xu , Scott Branden , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Ray Jui , PrasannaKumar Muralidharan , Harald Freudenberger , Krzysztof Kozlowski , Eric Anholt , Russell King , Rob Herring , "maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" , Sean Wang , Matt Mackall , Steffen Trumtrar , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We should be disabling the RNG in a hwrng::cleanup callback if we are not longer the system selected RNG, not wait until the device driver is removed. Signed-off-by: Florian Fainelli --- drivers/char/hw_random/bcm2835-rng.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 82000a637504..4d0356110b1b 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -83,6 +83,14 @@ static int bcm2835_rng_init(struct hwrng *rng) return 0; } +static void bcm2835_rng_cleanup(struct hwrng *rng) +{ + struct bcm2835_rng_priv *priv = to_rng_priv(rng); + + /* disable rng hardware */ + __raw_writel(0, priv->base + RNG_CTRL); +} + static const struct of_device_id bcm2835_rng_of_match[] = { { .compatible = "brcm,bcm2835-rng"}, { .compatible = "brcm,bcm-nsp-rng", .data = nsp_rng_init}, @@ -118,6 +126,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; + priv->rng.cleanup = bcm2835_rng_cleanup; rng_id = of_match_node(bcm2835_rng_of_match, np); if (!rng_id) @@ -142,9 +151,6 @@ static int bcm2835_rng_remove(struct platform_device *pdev) { struct bcm2835_rng_priv *priv = platform_get_drvdata(pdev); - /* disable rng hardware */ - __raw_writel(0, priv->base + RNG_CTRL); - /* unregister driver */ hwrng_unregister(&priv->rng);