From patchwork Wed Nov 8 00:44:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10047437 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 B5E1A60247 for ; Wed, 8 Nov 2017 00:46:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6B862A1AF for ; Wed, 8 Nov 2017 00:46:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99ACC2A1C7; Wed, 8 Nov 2017 00:46:54 +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 122802A1AF for ; Wed, 8 Nov 2017 00:46:54 +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=d8z9U9lLLJAKuFVPzYy/EMM7ww iNteZkjOSkTlZ6VPL3SPiSuyOesSUd0iSqx3eU+Dl6ZPzv475kiFyy7hSkr01S1Ce2nS869aAsJr4 Rqcp9gjeENv4RsNeXZ5S8VnI0/9NPl+QJksaYUF2YLH3+rlgHnS3E8rqr1NR5F4IrPZUMceZQcIQx zrdOGSaPBPDNP9MfDGPkluEaNwurDt1kojxADajOi33wTh8wjn8qH3Miaqw3O9Y1IQIgOfMpB9e4q qpuIGzVESUGJsKicbfcO0ycDDl3haHSqI8GCF95MgoYJUZiqRlLRclhaRktiZceOKzYXpGv3mSJFR Po4/dKzw==; 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 1eCEW5-0007KB-31; Wed, 08 Nov 2017 00:46:53 +0000 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCEUi-0005J3-M9; Wed, 08 Nov 2017 00:45:37 +0000 Received: by mail-qk0-x241.google.com with SMTP id a142so1398396qkb.5; Tue, 07 Nov 2017 16:45:08 -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=WrnBm9Pn9jBL1Yqv4BevW0skSAo4UF9k/oVdWaRmiQc=; b=J+jaizScJiaRR7fLXcGI+0PFh6ffmN89EXTI65hxFerdJfq8A4Ibis7qY5ZoZkBkfv qUVfzvAqmKuhidt/Onz1VEj4v3Nk7ntJZyk6k+y15x1nc/rtFhdSIB2dxENWO8UW+5SB DFeep6AZ8hVeF4G4ifGr+KRWmdaFqHRyTJiocIDNm9Lz5NMPf6NDh+JB3OzgmBwNipRK XAA9kjHcHcIqEs8clD+ntEHMMlQBo6CUCL4gqiLs+kp9kNL7t3huuVzdkPY/wZUenhZL lsN3EeRbjZSein8Kqpc9siAiHlfZi7Id8o2TxAP64UTjWut3vLfCw9tYyt9i0zPXZEz1 uq/Q== 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=bADBUY5la2XajTB3F9bLabr981IyA0tZqBjMNL4w6QzuPTWSGouHdv99Zrrg/Pf72d ZAksWBhIf8kPuDq7esXx/0Tdu6mrZZzGKBmX/hUBuS7XIJSo+Za6rWWAer8IFXii/ISk /Rb3JUtPGV8sxFwHdNhRfj43s0xZhFXos74nrrKHIhYRkzaf6OhAyftfQXJPHTaiPvPK ShDqCmE+JiMpltWdos0pdmmKiYyN5RWbW5es8PkNi6hU0T+C60T7wN4c1Rnzp5ou1Ihr q2l3L/xhR0yzFh+QWMtdzWg1Byo3l2cGAESV1+Q50tRjLtdbPWTD/Qk2v5QP4AUb69o/ iE8Q== X-Gm-Message-State: AJaThX5aT49giEbqh7xxmq/cd1iTSqON059mTlS3ER96u/ME4BO2I5V4 Y2zNv/SGIRCvpzsqB8IoJMQ= X-Google-Smtp-Source: ABhQp+TcRL6yJA1XodVVfcrILP4vl6XpwkA14GcgICfklpZB/oMu6n4+7Z0l9KsDhsTKa1b9lbF7Ig== X-Received: by 10.55.124.7 with SMTP id x7mr892070qkc.54.1510101907462; Tue, 07 Nov 2017 16:45:07 -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.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Nov 2017 16:45:06 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Subject: [PATCH v2 04/12] hwrng: bcm2835-rng: Implementation cleanup callback Date: Tue, 7 Nov 2017 16:44:41 -0800 Message-Id: <20171108004449.32730-5-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171107_164529_305857_FFC33B44 X-CRM114-Status: GOOD ( 11.43 ) 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);