[PATCH] hwrng: cctrng - add missing include to linux/fips.h

[PATCH] hwrng: cctrng - add missing include to linux/fips.h

[Hadar Gat]

This fixes build failure when CONFIG_CRYPTO_FIPS is defined.

Signed-off-by: Hadar Gat <hadar.gat@arm.com>
---
 drivers/char/hw_random/cctrng.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c
index bdcd562..e82716c 100644
--- a/drivers/char/hw_random/cctrng.c
+++ b/drivers/char/hw_random/cctrng.c
@@ -15,6 +15,7 @@
 #include <linux/completion.h>
 #include <linux/of.h>
 #include <linux/bitfield.h>
+#include <linux/fips.h>
 
 #include "cctrng.h"
 
-- 
2.7.4

Re: [PATCH] hwrng: cctrng - add missing include to linux/fips.h

[Randy Dunlap]

On 4/17/20 1:38 PM, Hadar Gat wrote:
> This fixes build failure when CONFIG_CRYPTO_FIPS is defined.
> 
> Signed-off-by: Hadar Gat <hadar.gat@arm.com>

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

> ---
>  drivers/char/hw_random/cctrng.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c
> index bdcd562..e82716c 100644
> --- a/drivers/char/hw_random/cctrng.c
> +++ b/drivers/char/hw_random/cctrng.c
> @@ -15,6 +15,7 @@
>  #include <linux/completion.h>
>  #include <linux/of.h>
>  #include <linux/bitfield.h>
> +#include <linux/fips.h>
>  
>  #include "cctrng.h"
>  
> 

thanks.
-- 
~Randy

Re: [PATCH] hwrng: cctrng - add missing include to linux/fips.h

[Herbert Xu]

On Fri, Apr 17, 2020 at 11:38:45PM +0300, Hadar Gat wrote:
> This fixes build failure when CONFIG_CRYPTO_FIPS is defined.
> 
> Signed-off-by: Hadar Gat <hadar.gat@arm.com>
> ---
>  drivers/char/hw_random/cctrng.c | 1 +
>  1 file changed, 1 insertion(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

hwrng: cctrng - Remove unnecessary FIPS ifdef

[Herbert Xu]

This patch removes the unnecessary FIPS ifdef in cctrng.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c
index e82716c12c3a..49fb65a221f3 100644
--- a/drivers/char/hw_random/cctrng.c
+++ b/drivers/char/hw_random/cctrng.c
@@ -331,13 +331,11 @@ void cc_trng_compwork_handler(struct work_struct *w)
 	ehr_valid = CC_REG_FLD_GET(RNG_ISR, EHR_VALID, isr);
 	dev_dbg(dev, "Got RNG_ISR=0x%08X (EHR_VALID=%u)\n", isr, ehr_valid);
 
-#ifdef CONFIG_CRYPTO_FIPS
-	if (CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr) && fips_enabled) {
+	if (fips_enabled && CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr)) {
 		fips_fail_notify();
 		/* FIPS error is fatal */
 		panic("Got HW CRNGT error while fips is enabled!\n");
 	}
-#endif
 
 	/* Clear all pending RNG interrupts */
 	cc_iowrite(drvdata, CC_RNG_ICR_REG_OFFSET, isr);
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

RE: hwrng: cctrng - Remove unnecessary FIPS ifdef

[Hadar Gat]

> -----Original Message-----
> From: Herbert Xu <herbert@gondor.apana.org.au>
> Sent: Monday, 20 April 2020 11:28
> To: Hadar Gat <Hadar.Gat@arm.com>
> Cc: Matt Mackall <mpm@selenic.com>; Arnd Bergmann <arnd@arndb.de>;
> Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Gilad Ben-Yossef
> <gilad@benyossef.com>; Ofir Drang <Ofir.Drang@arm.com>; linux-
> crypto@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: hwrng: cctrng - Remove unnecessary FIPS ifdef
> 
> This patch removes the unnecessary FIPS ifdef in cctrng.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 

Acked-by: Hadar Gat <hadar.gat@arm.com>


> diff --git a/drivers/char/hw_random/cctrng.c
> b/drivers/char/hw_random/cctrng.c index e82716c12c3a..49fb65a221f3
> 100644
> --- a/drivers/char/hw_random/cctrng.c
> +++ b/drivers/char/hw_random/cctrng.c
> @@ -331,13 +331,11 @@ void cc_trng_compwork_handler(struct
> work_struct *w)
>  	ehr_valid = CC_REG_FLD_GET(RNG_ISR, EHR_VALID, isr);
>  	dev_dbg(dev, "Got RNG_ISR=0x%08X (EHR_VALID=%u)\n", isr,
> ehr_valid);
> 
> -#ifdef CONFIG_CRYPTO_FIPS
> -	if (CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr) && fips_enabled) {
> +	if (fips_enabled && CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr)) {
>  		fips_fail_notify();
>  		/* FIPS error is fatal */
>  		panic("Got HW CRNGT error while fips is enabled!\n");
>  	}
> -#endif
> 
>  	/* Clear all pending RNG interrupts */
>  	cc_iowrite(drvdata, CC_RNG_ICR_REG_OFFSET, isr);
> --
> Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page:
> http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt