From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756217AbcK2HIv (ORCPT ); Tue, 29 Nov 2016 02:08:51 -0500 Received: from helcar.hengli.com.au ([209.40.204.226]:54246 "EHLO helcar.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753188AbcK2HIt (ORCPT ); Tue, 29 Nov 2016 02:08:49 -0500 Date: Tue, 29 Nov 2016 15:08:40 +0800 From: Herbert Xu To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the crypto tree Message-ID: <20161129070840.GA5113@gondor.apana.org.au> References: <20161129115529.41f9f0b5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161129115529.41f9f0b5@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 29, 2016 at 11:55:29AM +1100, Stephen Rothwell wrote: > Hi Herbert, > > After merging the crypto tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-ce.ko] undefined! > ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-ce.ko] undefined! > ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-bs.ko] undefined! > ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-bs.ko] undefined! > > Caused by commits > > da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher") > 211f41af534a ("crypto: aesbs - Convert to skcipher") > > Missing dependencies? > > I have used the crypto tree from next-20161128 for today. Indeed. This patch should fix the problem. ---8<--- Subject: crypto: arm/aes - Select SIMD in Kconfig The skcipher conversion for ARM missed the select on CRYPTO_SIMD, causing build failures if SIMD was not otherwise enabled. Fixes: da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher") Fixes: 211f41af534a ("crypto: aesbs - Convert to skcipher") Reported-by: Stephen Rothwell Signed-off-by: Herbert Xu diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig index 27ed1b1..8134888 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -105,7 +105,7 @@ config CRYPTO_AES_ARM_CE tristate "Accelerated AES using ARMv8 Crypto Extensions" depends on KERNEL_MODE_NEON select CRYPTO_ALGAPI - select CRYPTO_ABLK_HELPER + select CRYPTO_SIMD help Use an implementation of AES in CBC, CTR and XTS modes that uses ARMv8 Crypto Extensions diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index 5f4a617..c5ce39c 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -48,14 +48,14 @@ config CRYPTO_AES_ARM64_CE_BLK depends on ARM64 && KERNEL_MODE_NEON select CRYPTO_BLKCIPHER select CRYPTO_AES_ARM64_CE - select CRYPTO_ABLK_HELPER + select CRYPTO_SIMD config CRYPTO_AES_ARM64_NEON_BLK tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions" depends on ARM64 && KERNEL_MODE_NEON select CRYPTO_BLKCIPHER select CRYPTO_AES - select CRYPTO_ABLK_HELPER + select CRYPTO_SIMD config CRYPTO_CRC32_ARM64 tristate "CRC32 and CRC32C using optional ARMv8 instructions" -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt