Linux kernel -stable discussions
 help / color / mirror / Atom feed
* [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC
@ 2020-07-15  8:38 Tudor Ambarus
  2020-07-15  9:20 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Tudor Ambarus @ 2020-07-15  8:38 UTC (permalink / raw)
  To: gregkh, alexander.levin
  Cc: stable, herbert, Tudor Ambarus, Hulk Robot, kernel test robot,
	YueHaibing

Backport to 5.4.52-rc1 the following commits in upstream:
commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.
commit d158367682cd822aca811971e988be6a8d8f679f upstream.

If CRYPTO_DEV_ATMEL_AUTHENC is m, CRYPTO_DEV_ATMEL_SHA is m,
but CRYPTO_DEV_ATMEL_AES is y, building will fail:

drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_init_tfm':
atmel-aes.c:(.text+0x670): undefined reference to `atmel_sha_authenc_get_reqsize'
atmel-aes.c:(.text+0x67a): undefined reference to `atmel_sha_authenc_spawn'
drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_setkey':
atmel-aes.c:(.text+0x7e5): undefined reference to `atmel_sha_authenc_setkey'

Make CRYPTO_DEV_ATMEL_AUTHENC depend on CRYPTO_DEV_ATMEL_AES,
and select CRYPTO_DEV_ATMEL_SHA and CRYPTO_AUTHENC for it under there.

Reported-by: Hulk Robot <hulkci@huawei.com>
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[tudor.ambarus@microchip.com: Backport to 5.4.52-rc1]
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
 drivers/crypto/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 06b2b3fa5206..0952f059d967 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -491,11 +491,9 @@ if CRYPTO_DEV_UX500
 endif # if CRYPTO_DEV_UX500
 
 config CRYPTO_DEV_ATMEL_AUTHENC
-	tristate "Support for Atmel IPSEC/SSL hw accelerator"
+	bool "Support for Atmel IPSEC/SSL hw accelerator"
 	depends on ARCH_AT91 || COMPILE_TEST
-	select CRYPTO_AUTHENC
-	select CRYPTO_DEV_ATMEL_AES
-	select CRYPTO_DEV_ATMEL_SHA
+	depends on CRYPTO_DEV_ATMEL_AES
 	help
 	  Some Atmel processors can combine the AES and SHA hw accelerators
 	  to enhance support of IPSEC/SSL.
@@ -508,6 +506,8 @@ config CRYPTO_DEV_ATMEL_AES
 	select CRYPTO_AES
 	select CRYPTO_AEAD
 	select CRYPTO_BLKCIPHER
+	select CRYPTO_AUTHENC if CRYPTO_DEV_ATMEL_AUTHENC
+	select CRYPTO_DEV_ATMEL_SHA if CRYPTO_DEV_ATMEL_AUTHENC
 	help
 	  Some Atmel processors have AES hw accelerator.
 	  Select this if you want to use the Atmel module for
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC
  2020-07-15  8:38 [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC Tudor Ambarus
@ 2020-07-15  9:20 ` Greg KH
  2020-07-15 11:37   ` Tudor.Ambarus
  0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2020-07-15  9:20 UTC (permalink / raw)
  To: Tudor Ambarus
  Cc: alexander.levin, stable, herbert, Hulk Robot, kernel test robot,
	YueHaibing

On Wed, Jul 15, 2020 at 11:38:02AM +0300, Tudor Ambarus wrote:
> Backport to 5.4.52-rc1 the following commits in upstream:
> commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.
> commit d158367682cd822aca811971e988be6a8d8f679f upstream.

Please backport the individual commits, do not squash them together.
That way lies problems as it is hard to track and almost always
incorrect.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC
  2020-07-15  9:20 ` Greg KH
@ 2020-07-15 11:37   ` Tudor.Ambarus
  2020-07-15 12:22     ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Tudor.Ambarus @ 2020-07-15 11:37 UTC (permalink / raw)
  To: gregkh; +Cc: alexander.levin, stable, herbert, hulkci, lkp, yuehaibing

On 7/15/20 12:20 PM, Greg KH wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On Wed, Jul 15, 2020 at 11:38:02AM +0300, Tudor Ambarus wrote:
>> Backport to 5.4.52-rc1 the following commits in upstream:
>> commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.
>> commit d158367682cd822aca811971e988be6a8d8f679f upstream.
> 
> Please backport the individual commits, do not squash them together.
> That way lies problems as it is hard to track and almost always
> incorrect.
> 

d158367682cd822aca811971e988be6a8d8f679f attempted to fix the problem,
but it was just papering it. The real fix is in
aee1f9f3c30e1e20e7f74729ced61eac7d74ca68. I kept references to both
commits for tracking reasons.

Please let me know if you still want me to backport both in dedicated
patches, or maybe to just drop the reference to
d158367682cd822aca811971e988be6a8d8f679f

Cheers,
ta

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC
  2020-07-15 11:37   ` Tudor.Ambarus
@ 2020-07-15 12:22     ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2020-07-15 12:22 UTC (permalink / raw)
  To: Tudor.Ambarus; +Cc: alexander.levin, stable, herbert, hulkci, lkp, yuehaibing

On Wed, Jul 15, 2020 at 11:37:47AM +0000, Tudor.Ambarus@microchip.com wrote:
> On 7/15/20 12:20 PM, Greg KH wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> > 
> > On Wed, Jul 15, 2020 at 11:38:02AM +0300, Tudor Ambarus wrote:
> >> Backport to 5.4.52-rc1 the following commits in upstream:
> >> commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.
> >> commit d158367682cd822aca811971e988be6a8d8f679f upstream.
> > 
> > Please backport the individual commits, do not squash them together.
> > That way lies problems as it is hard to track and almost always
> > incorrect.
> > 
> 
> d158367682cd822aca811971e988be6a8d8f679f attempted to fix the problem,
> but it was just papering it. The real fix is in
> aee1f9f3c30e1e20e7f74729ced61eac7d74ca68. I kept references to both
> commits for tracking reasons.
> 
> Please let me know if you still want me to backport both in dedicated
> patches, or maybe to just drop the reference to
> d158367682cd822aca811971e988be6a8d8f679f

No, please backport both, as a patch series.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-07-15 12:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-15  8:38 [PATCH 5.4] crypto: atmel - Fix build error of CRYPTO_AUTHENC Tudor Ambarus
2020-07-15  9:20 ` Greg KH
2020-07-15 11:37   ` Tudor.Ambarus
2020-07-15 12:22     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox