crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX

crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX

[Herbert Xu]

On Fri, Aug 25, 2023 at 07:44:32PM +0800, kernel test robot wrote:
>
> All errors (new ones prefixed by >>):
> 
>    In file included from arch/powerpc/crypto/poly1305-p10-glue.c:19:

...

> ae3a197e3d0bfe3 David Howells    2012-03-28  75  
> ae3a197e3d0bfe3 David Howells    2012-03-28  76  #ifdef CONFIG_VSX
> d1e1cf2e38def30 Anton Blanchard  2015-10-29  77  extern void enable_kernel_vsx(void);
> ae3a197e3d0bfe3 David Howells    2012-03-28  78  extern void flush_vsx_to_thread(struct task_struct *);
> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  79  static inline void disable_kernel_vsx(void)
> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  80  {
> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  81  	msr_check_and_clear(MSR_FP|MSR_VEC|MSR_VSX);
> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  82  }
> bd73758803c2eed Christophe Leroy 2021-03-09  83  #else
> bd73758803c2eed Christophe Leroy 2021-03-09  84  static inline void enable_kernel_vsx(void)
> bd73758803c2eed Christophe Leroy 2021-03-09  85  {
> bd73758803c2eed Christophe Leroy 2021-03-09 @86  	BUILD_BUG();
> bd73758803c2eed Christophe Leroy 2021-03-09  87  }
> bd73758803c2eed Christophe Leroy 2021-03-09  88  

---8<---
Add dependency on VSX as otherwise the build will fail without
it.

Fixes: 161fca7e3e90 ("crypto: powerpc - Add chacha20/poly1305-p10 to Kconfig and Makefile")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308251906.SYawej6g-lkp@intel.com/
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig
index f25024afdda5..7a66d7c0e6a2 100644
--- a/arch/powerpc/crypto/Kconfig
+++ b/arch/powerpc/crypto/Kconfig
@@ -113,7 +113,7 @@ config CRYPTO_AES_GCM_P10
 
 config CRYPTO_CHACHA20_P10
 	tristate "Ciphers: ChaCha20, XChacha20, XChacha12 (P10 or later)"
-	depends on PPC64 && CPU_LITTLE_ENDIAN
+	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
 	select CRYPTO_SKCIPHER
 	select CRYPTO_LIB_CHACHA_GENERIC
 	select CRYPTO_ARCH_HAVE_LIB_CHACHA
@@ -127,7 +127,7 @@ config CRYPTO_CHACHA20_P10
 
 config CRYPTO_POLY1305_P10
 	tristate "Hash functions: Poly1305 (P10 or later)"
-	depends on PPC64 && CPU_LITTLE_ENDIAN
+	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
 	select CRYPTO_HASH
 	select CRYPTO_LIB_POLY1305_GENERIC
 	help
-- 
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: crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX

[Michael Ellerman]

Herbert Xu <herbert@gondor.apana.org.au> writes:
> On Fri, Aug 25, 2023 at 07:44:32PM +0800, kernel test robot wrote:
>>
>> All errors (new ones prefixed by >>):
>> 
>>    In file included from arch/powerpc/crypto/poly1305-p10-glue.c:19:
>
> ...
>
>> ae3a197e3d0bfe3 David Howells    2012-03-28  75  
>> ae3a197e3d0bfe3 David Howells    2012-03-28  76  #ifdef CONFIG_VSX
>> d1e1cf2e38def30 Anton Blanchard  2015-10-29  77  extern void enable_kernel_vsx(void);
>> ae3a197e3d0bfe3 David Howells    2012-03-28  78  extern void flush_vsx_to_thread(struct task_struct *);
>> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  79  static inline void disable_kernel_vsx(void)
>> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  80  {
>> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  81  	msr_check_and_clear(MSR_FP|MSR_VEC|MSR_VSX);
>> 3eb5d5888dc68c9 Anton Blanchard  2015-10-29  82  }
>> bd73758803c2eed Christophe Leroy 2021-03-09  83  #else
>> bd73758803c2eed Christophe Leroy 2021-03-09  84  static inline void enable_kernel_vsx(void)
>> bd73758803c2eed Christophe Leroy 2021-03-09  85  {
>> bd73758803c2eed Christophe Leroy 2021-03-09 @86  	BUILD_BUG();
>> bd73758803c2eed Christophe Leroy 2021-03-09  87  }
>> bd73758803c2eed Christophe Leroy 2021-03-09  88  
>
> ---8<---
> Add dependency on VSX as otherwise the build will fail without
> it.
>
> Fixes: 161fca7e3e90 ("crypto: powerpc - Add chacha20/poly1305-p10 to Kconfig and Makefile")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202308251906.SYawej6g-lkp@intel.com/
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)

cheers

> diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig
> index f25024afdda5..7a66d7c0e6a2 100644
> --- a/arch/powerpc/crypto/Kconfig
> +++ b/arch/powerpc/crypto/Kconfig
> @@ -113,7 +113,7 @@ config CRYPTO_AES_GCM_P10
>  
>  config CRYPTO_CHACHA20_P10
>  	tristate "Ciphers: ChaCha20, XChacha20, XChacha12 (P10 or later)"
> -	depends on PPC64 && CPU_LITTLE_ENDIAN
> +	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
>  	select CRYPTO_SKCIPHER
>  	select CRYPTO_LIB_CHACHA_GENERIC
>  	select CRYPTO_ARCH_HAVE_LIB_CHACHA
> @@ -127,7 +127,7 @@ config CRYPTO_CHACHA20_P10
>  
>  config CRYPTO_POLY1305_P10
>  	tristate "Hash functions: Poly1305 (P10 or later)"
> -	depends on PPC64 && CPU_LITTLE_ENDIAN
> +	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
>  	select CRYPTO_HASH
>  	select CRYPTO_LIB_POLY1305_GENERIC
>  	help
> -- 
> 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