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 A4BC6C2BB9A for ; Mon, 14 Dec 2020 17:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6869622509 for ; Mon, 14 Dec 2020 17:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440511AbgLNRzA (ORCPT ); Mon, 14 Dec 2020 12:55:00 -0500 Received: from lpdvacalvio01.broadcom.com ([192.19.229.182]:35798 "EHLO relay.smtp-ext.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732436AbgLNRyt (ORCPT ); Mon, 14 Dec 2020 12:54:49 -0500 X-Greylist: delayed 490 seconds by postgrey-1.27 at vger.kernel.org; Mon, 14 Dec 2020 12:54:46 EST 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 09ADC80E3; Mon, 14 Dec 2020 09:45:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 09ADC80E3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1607967938; bh=AmNcKbdMqhqlJWgOqKFduLFh2nSR2MZaSlc8ErgP3rQ=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=FUIQlo47TnNfZAsYW1U83C/bnAdy06uCY7OVJwD8zVddfyMO5BydpZ04kxxCTyOQO OdfvVBvKA9pIXDu545hub0tUoUXGJks/V4yHBto71SLj5d291j7Ht/Oq2Di0SC8YJ4 KCKy+1sxnC9EJ4zyrToonCGQRIMtWakUdJXsNezA= Subject: Re: [PATCH 1/2] hwrng: iproc-rng200: Fix disable of the block. 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> From: Scott Branden Message-ID: <24e22e5a-7371-02b4-1636-2e03def420e3@broadcom.com> Date: Mon, 14 Dec 2020 09:45:37 -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-1-matthias.bgg@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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 > > When trying to disable the block we bitwise or the control > register with value zero. This will leave the block always turned on. > Fix this by setting the corresponding bit to zero. > > Fixes: c83d45d5685f ("hwrng: iproc-rng200 - Add Broadcom IPROC RNG driver") Commit message needs to be re-written. I don't think this is an actual fix as the ~RNG_CTL_RNG_RBGEN_MASK already zeros the bit.  This is just a code change, which is fine because it makes things clearer > Signed-off-by: Matthias Brugger > --- > > drivers/char/hw_random/iproc-rng200.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c > index 01583faf9893..e106ce3c0146 100644 > --- a/drivers/char/hw_random/iproc-rng200.c > +++ b/drivers/char/hw_random/iproc-rng200.c > @@ -28,7 +28,6 @@ > #define RNG_CTRL_OFFSET 0x00 > #define RNG_CTRL_RNG_RBGEN_MASK 0x00001FFF > #define RNG_CTRL_RNG_RBGEN_ENABLE 0x00000001 > -#define RNG_CTRL_RNG_RBGEN_DISABLE 0x00000000 > > #define RNG_SOFT_RESET_OFFSET 0x04 > #define RNG_SOFT_RESET 0x00000001 > @@ -61,7 +60,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) > /* Disable RBG */ > val = ioread32(rng_base + RNG_CTRL_OFFSET); > val &= ~RNG_CTRL_RNG_RBGEN_MASK; This mask will already zero the enable bit. > - val |= RNG_CTRL_RNG_RBGEN_DISABLE; > + val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > iowrite32(val, rng_base + RNG_CTRL_OFFSET); > > /* Clear all interrupt status */ > @@ -174,7 +173,7 @@ static void iproc_rng200_cleanup(struct hwrng *rng) > /* Disable RNG hardware */ > val = ioread32(priv->base + RNG_CTRL_OFFSET); > val &= ~RNG_CTRL_RNG_RBGEN_MASK; > - val |= RNG_CTRL_RNG_RBGEN_DISABLE; > + val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; > iowrite32(val, priv->base + RNG_CTRL_OFFSET); > } > 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 44BFBC4361B for ; Mon, 14 Dec 2020 17:49:29 +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 EF75221534 for ; Mon, 14 Dec 2020 17:49:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF75221534 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=Y/4r4rD4Gj6OkZi4pqXJ3vYFEDMDIJ8uJcCaEqC/R54=; b=M2MCyX1SbvJpm5OIGmLD0MvUW zUfs6kxZ5hGG1g4AdXQI3U2E+9ouBLNjjGkGiI72NHFjg/ZbnWZ18V1M12JQRZCLmVGSgWpqRRIUq 326y+4CWYoT2n2zO6Cc4uYJ/gZwfCrciiGYS1uGrivdb6xfelmkHCDnQHycY5EoaHrIHk78/uA3Gs 88JYwO3GXtKgggXYQTmaroOl95bKSx1SmkbkTj9cIZaVC7I4KOrcrmr/kVWi5wZ1StYideWgf9ZQD SvMiXF3AZmjPOV5J+6yrcO/WfuB44RhoAGzMcuFqRsg7lW6TnI3iTktNwITee04Lqm/q9b3aiVXzi dmClR/Y1w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1korwZ-0001bZ-9g; Mon, 14 Dec 2020 17:47:31 +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 1korup-0000lj-Pw for linux-arm-kernel@lists.infradead.org; Mon, 14 Dec 2020 17:45:51 +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 09ADC80E3; Mon, 14 Dec 2020 09:45:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 09ADC80E3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1607967938; bh=AmNcKbdMqhqlJWgOqKFduLFh2nSR2MZaSlc8ErgP3rQ=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=FUIQlo47TnNfZAsYW1U83C/bnAdy06uCY7OVJwD8zVddfyMO5BydpZ04kxxCTyOQO OdfvVBvKA9pIXDu545hub0tUoUXGJks/V4yHBto71SLj5d291j7Ht/Oq2Di0SC8YJ4 KCKy+1sxnC9EJ4zyrToonCGQRIMtWakUdJXsNezA= Subject: Re: [PATCH 1/2] hwrng: iproc-rng200: Fix disable of the block. 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> From: Scott Branden Message-ID: <24e22e5a-7371-02b4-1636-2e03def420e3@broadcom.com> Date: Mon, 14 Dec 2020 09:45:37 -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-1-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_124544_202821_627CCBFA X-CRM114-Status: GOOD ( 20.46 ) 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="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CgpPbiAyMDIwLTEyLTE0IDg6MDQgYS5tLiwgbWF0dGhpYXMuYmdnQGtlcm5lbC5vcmcgd3JvdGU6 Cj4gRnJvbTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdnZXJAc3VzZS5jb20+Cj4KPiBXaGVuIHRy eWluZyB0byBkaXNhYmxlIHRoZSBibG9jayB3ZSBiaXR3aXNlIG9yIHRoZSBjb250cm9sCj4gcmVn aXN0ZXIgd2l0aCB2YWx1ZSB6ZXJvLiBUaGlzIHdpbGwgbGVhdmUgdGhlIGJsb2NrIGFsd2F5cyB0 dXJuZWQgb24uCj4gRml4IHRoaXMgYnkgc2V0dGluZyB0aGUgY29ycmVzcG9uZGluZyBiaXQgdG8g emVyby4KPgo+IEZpeGVzOiBjODNkNDVkNTY4NWYgKCJod3JuZzogaXByb2Mtcm5nMjAwIC0gQWRk IEJyb2FkY29tIElQUk9DIFJORyBkcml2ZXIiKQpDb21taXQgbWVzc2FnZSBuZWVkcyB0byBiZSBy ZS13cml0dGVuLgpJIGRvbid0IHRoaW5rIHRoaXMgaXMgYW4gYWN0dWFsIGZpeCBhcyB0aGUgflJO R19DVExfUk5HX1JCR0VOX01BU0sgYWxyZWFkeSB6ZXJvcyB0aGUgYml0LsKgIFRoaXMgaXMganVz dCBhIGNvZGUgY2hhbmdlLCB3aGljaCBpcyBmaW5lIGJlY2F1c2UgaXQgbWFrZXMgdGhpbmdzIGNs ZWFyZXIKPiBTaWduZWQtb2ZmLWJ5OiBNYXR0aGlhcyBCcnVnZ2VyIDxtYnJ1Z2dlckBzdXNlLmNv bT4KPiAtLS0KPgo+ICBkcml2ZXJzL2NoYXIvaHdfcmFuZG9tL2lwcm9jLXJuZzIwMC5jIHwgNSAr Ky0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+ Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvY2hhci9od19yYW5kb20vaXByb2Mtcm5nMjAwLmMgYi9k cml2ZXJzL2NoYXIvaHdfcmFuZG9tL2lwcm9jLXJuZzIwMC5jCj4gaW5kZXggMDE1ODNmYWY5ODkz Li5lMTA2Y2UzYzAxNDYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9jaGFyL2h3X3JhbmRvbS9pcHJv Yy1ybmcyMDAuYwo+ICsrKyBiL2RyaXZlcnMvY2hhci9od19yYW5kb20vaXByb2Mtcm5nMjAwLmMK PiBAQCAtMjgsNyArMjgsNiBAQAo+ICAjZGVmaW5lIFJOR19DVFJMX09GRlNFVAkJCQkJMHgwMAo+ ICAjZGVmaW5lIFJOR19DVFJMX1JOR19SQkdFTl9NQVNLCQkJCTB4MDAwMDFGRkYKPiAgI2RlZmlu ZSBSTkdfQ1RSTF9STkdfUkJHRU5fRU5BQkxFCQkJMHgwMDAwMDAwMQo+IC0jZGVmaW5lIFJOR19D VFJMX1JOR19SQkdFTl9ESVNBQkxFCQkJMHgwMDAwMDAwMAo+ICAKPiAgI2RlZmluZSBSTkdfU09G VF9SRVNFVF9PRkZTRVQJCQkJMHgwNAo+ICAjZGVmaW5lIFJOR19TT0ZUX1JFU0VUCQkJCQkweDAw MDAwMDAxCj4gQEAgLTYxLDcgKzYwLDcgQEAgc3RhdGljIHZvaWQgaXByb2Nfcm5nMjAwX3Jlc3Rh cnQodm9pZCBfX2lvbWVtICpybmdfYmFzZSkKPiAgCS8qIERpc2FibGUgUkJHICovCj4gIAl2YWwg PSBpb3JlYWQzMihybmdfYmFzZSArIFJOR19DVFJMX09GRlNFVCk7Cj4gIAl2YWwgJj0gflJOR19D VFJMX1JOR19SQkdFTl9NQVNLOwpUaGlzIG1hc2sgd2lsbCBhbHJlYWR5IHplcm8gdGhlIGVuYWJs ZSBiaXQuCj4gLQl2YWwgfD0gUk5HX0NUUkxfUk5HX1JCR0VOX0RJU0FCTEU7Cj4gKwl2YWwgJj0g flJOR19DVFJMX1JOR19SQkdFTl9FTkFCTEU7Cj4gIAlpb3dyaXRlMzIodmFsLCBybmdfYmFzZSAr IFJOR19DVFJMX09GRlNFVCk7Cj4gIAo+ICAJLyogQ2xlYXIgYWxsIGludGVycnVwdCBzdGF0dXMg Ki8KPiBAQCAtMTc0LDcgKzE3Myw3IEBAIHN0YXRpYyB2b2lkIGlwcm9jX3JuZzIwMF9jbGVhbnVw KHN0cnVjdCBod3JuZyAqcm5nKQo+ICAJLyogRGlzYWJsZSBSTkcgaGFyZHdhcmUgKi8KPiAgCXZh bCA9IGlvcmVhZDMyKHByaXYtPmJhc2UgKyBSTkdfQ1RSTF9PRkZTRVQpOwo+ICAJdmFsICY9IH5S TkdfQ1RSTF9STkdfUkJHRU5fTUFTSzsKPiAtCXZhbCB8PSBSTkdfQ1RSTF9STkdfUkJHRU5fRElT QUJMRTsKPiArCXZhbCAmPSB+Uk5HX0NUUkxfUk5HX1JCR0VOX0VOQUJMRTsKPiAgCWlvd3JpdGUz Mih2YWwsIHByaXYtPmJhc2UgKyBSTkdfQ1RSTF9PRkZTRVQpOwo+ICB9Cj4gIAoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK