From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759006AbcK3VDb (ORCPT ); Wed, 30 Nov 2016 16:03:31 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:59208 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908AbcK3VDO (ORCPT ); Wed, 30 Nov 2016 16:03:14 -0500 From: Arnd Bergmann To: Herbert Xu Cc: Arnd Bergmann , =?UTF-8?q?Horia=20Geant=C4=83?= , Dan Douglass , "David S. Miller" , Tudor Ambarus , Alex Porosanu , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] crypto: caam: make aamalg_desc a proper module Date: Wed, 30 Nov 2016 22:02:00 +0100 Message-Id: <20161130210234.1666417-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161130210234.1666417-1-arnd@arndb.de> References: <20161130210234.1666417-1-arnd@arndb.de> X-Provags-ID: V03:K0:bHKRvxt3ncsMun+5mhdVAX7tIHNbEA6FqC4LnrTJGUtDlZmB0EH ut2Llk/z8hzD8Mk2Z3mD7i4oHq7RJ71DzWm66Rp6mfphthhpgL+9pPS+J4NoBSXg+qMik8q QwtWQxWolMmotKeJcSxvHmZohw17zODN9clN4Ks67R28J3Fz3Gu9Mk/bB0lcPh4AM5gA8EQ VeOtQ3Det2ERUveqXfItw== X-UI-Out-Filterresults: notjunk:1;V01:K0:8CKuvLosd9s=:HvWxKEUVhhQPyeBhxfzbeo 8zE3AoqkLJYuSgHidOJX63HEA07U2ekCb3UY5E4lIJnmTZfYAdzNAUwCp7OEbACZkUYuAloTs 8zpGckq4ONPQ+3sQSREhoB4IDynH4M3jjSG2Yjm0ZCJb16BbBHtZp2nbdffJXbaE1s2GOS9dR d+g9A87qyPKOGRDIxkRAnKGOJ/0OWJZMxnlMWtDhOuVXG+J2Ikmm+XvfmmcmxED1NtSWzbB01 Inq4FyZZEcUwbeCINj7MS8tTjz7qI9zGQmDcffGQUlKfudhrFMNhnLhdRTRq0EY5I3TxrdiJt rFSaYyDMjW6uJ+g3EiXWen2+9ar3bEEagUo5X16jfFZ4jrApK5eNVpW6M/TeNTe+aWwNHo735 6WgV33M1kcRJr5KanjqJ1G7BJ6Vea5TnS7DMx99j7F+v75H6V7j7/C2qQrV+tX1C4vaq2VZwm GmKRf4i9Ih6VSAqYyoJsRiYJVlU9jX0XAlcKm5E1thwuk3YNgGPePdELZMKvCwEFQRky3Nzxa mngCjQLc5RoLA29k6f5FaVHyR73k4PjAyh97WIIG9qB00uqU5iaYvgrPJDYWd3pt42Q5SWajw udZYiJvQsxxGxJx5E8CXXcI82TWvWQaHe5FNKccL6BS72dLhx992T7Z6HOj0pq+N9qZ5Dc8UM u4TL+eWAmlVULiwyh4i7xP7M4f0EAgcgjHpu6LQ1Nfg3mN9EHN/xyaxj5kl8IxF4OpXs= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The drivers/crypto/caam/ directory is entered during build only for building modules when CONFIG_CRYPTO_DEV_FSL_CAAM=m, but CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is defined as a 'bool' symbol, meaning that caamalg_desc.c is always compiled into built-in code, or not at all, leading to a link failure: ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! ... Making caamalg_desc itself a loadable module fixes this configuration by ensuring the driver gets built. Aside from making the symbol 'tristate', I'm adding appropriate module metadata here. Fixes: 8cea7b66b821 ("crypto: caam - refactor encryption descriptors generation") Signed-off-by: Arnd Bergmann --- drivers/crypto/caam/Kconfig | 2 +- drivers/crypto/caam/caamalg_desc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig index da24c5752c06..bc0d3569f8d9 100644 --- a/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig @@ -136,4 +136,4 @@ config CRYPTO_DEV_FSL_CAAM_DEBUG information in the CAAM driver. config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC - def_bool CRYPTO_DEV_FSL_CAAM_CRYPTO_API + def_tristate CRYPTO_DEV_FSL_CAAM_CRYPTO_API diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caamalg_desc.c index 7dee952ef432..f3f48c10b9d6 100644 --- a/drivers/crypto/caam/caamalg_desc.c +++ b/drivers/crypto/caam/caamalg_desc.c @@ -1300,3 +1300,7 @@ void cnstr_shdsc_xts_ablkcipher_decap(u32 * const desc, struct alginfo *cdata) #endif } EXPORT_SYMBOL(cnstr_shdsc_xts_ablkcipher_decap); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("FSL CAAM descriptor support"); +MODULE_AUTHOR("Freescale Semiconductor - NMG/STC"); -- 2.9.0