From patchwork Thu Dec 20 15:28:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 154340 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6320503ljp; Thu, 20 Dec 2018 07:28:34 -0800 (PST) X-Google-Smtp-Source: AFSGD/U/jcXVtUG4E+KLsu0hE6pv4uHLvRY+IsDMK1ypARYiPShien851AJI3tHID2+/Na+ryjBc X-Received: by 2002:a63:a611:: with SMTP id t17mr23124342pge.338.1545319713999; Thu, 20 Dec 2018 07:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545319713; cv=none; d=google.com; s=arc-20160816; b=gV3ShbQA7xT3I8Wb5o4Z1in2tHXx/qhGb8PnqE2rncSs6P4bt6iLQ1zQm2qOOyq+Yy FQZ/wTsfNerwYychbyKPnyc2Vu1ReRSzqodQtWDstWQQ0sqzWUhGaEwTHpW4oBZA1ixZ 7HnQYn1DrjhAF0MyHC9YSdL72GPRxkRUDMZBPC7TbKoFXd7wVmX5N10u89DqlZDCYyl7 Kfcv3ea7GYcfzIFL4S7Y7vEyZ3eFIU9o0AlgENpf1PWkXrXfNjeYeXgCvxJLj6WpVFZy 0Cq/ihGK4M+lPAbGm/2OHHwfKrcPEXhLAS4cSP8aOZSWZmSgLlcizbGFSfU1h+mWGu/t 6xig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=VXRSBGXePoKB0OzA4w2ISOP/mFi/LYKMw+9RgwvY6d0=; b=oKWwN+fim5+TfWCaNz1i86bKfV41VvIuxzhAsi9NqKVahYFNkoslvikLr3QqzbG/6f Eo40W480QyeBVemZxg0oZmfl5B5ZV5HTYx+GreKDmLIUbgMgjtzjpUg4Gq4cTdPYuv/G W4EHtW5kkQ1fib4hrQ8hhAAmmiKoMFdOtPo9ArvUrxrNfjae9XyHhHft8BwE0yjpb48U vsheP5ylAOYOEkmztemGKz8NfOozRUBUyxLozKKc5oeJtjsSBZrRommiEbGXdsVtGGu5 D5Q7acn10Dwe/tkpvneWf6luZtrjV0Kq6pm93lSl7T7NnxasbNDvRoL6tyuHYCB/2A4p e8tA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x74si965277pfe.23.2018.12.20.07.28.33; Thu, 20 Dec 2018 07:28:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730388AbeLTP2d (ORCPT + 2 others); Thu, 20 Dec 2018 10:28:33 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:39789 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729937AbeLTP2d (ORCPT ); Thu, 20 Dec 2018 10:28:33 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MFsIZ-1gcQpS3DwN-00HM8h; Thu, 20 Dec 2018 16:28:17 +0100 From: Arnd Bergmann To: =?utf-8?q?Horia_Geant=C4=83?= , Aymen Sghaier , Herbert Xu , "David S. Miller" Cc: Arnd Bergmann , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: caam/qi2 - add a CRYPTO_DEV_FSL_CAAM dependency Date: Thu, 20 Dec 2018 16:28:08 +0100 Message-Id: <20181220152815.3613164-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:v+XQUo6SIUwwKZGgippx+SjKBDveMnmTODxVosA0iq5FZlQOOXd n2iBEOpQ1LviVUPL/OA3DHXBuqZqWDJfZKmoA0Ulaz6VHJUtU2dwmYNFmjldGHgvuOZv6vo 8r192+m2vaguWotfpyIRTgGSNQSDKNhbPNOMkimNM/lcGgd6DJuPjG/+PqA3Tj6hIfCyyLt ZVmfzXQB6ScrelEPMz47A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:cIHNk4CPPKI=:4KJK/bBC2nTM02kfsH51gI DuTry+pWBnTgeS9twJo/2C4ZFNZFIOGgrwip93f4yw/6UHUnm5bOuvQyKX++BhSAhhBTKpYXt gO6Goq1hZRf5eoeCABQk+GCLit4ziBHvVKQ70jBc3HFM0xXn8Lh/IC8NGPsCXMua60wpsR30P UKxlZYVdfE0xdF+22/NhJMpOq8oQiB+IVueB06q3+bF8NGGRpyZxH+RTcH//Y4yG9udOVZjLq EqDgqbceO3ev/VubiCm9pVtSoa65gbgWtRLT+t4VGb8+RN/JPDg6PIudPCdaapEM11kHoQxSM URh8nfNM4oVozcMkcmJjlg/tA1T6g3fCNp5KXA45ki8ggWvsWlZfRs7djGTGiYwueKLO7d8A/ RZEJtgWVfYe3XJJnLsZBl6ZG9X1VCmTjuD8HJQoqRA5BJ1y0elIgHXLmYr2DtnjMKohl0BnRm HHyxkl8n8tos76lOvs0B2RDEIB3gqsouG4Grus7jjFROOaETiufoaMsp/HOujMRqGMEm1dr6n W134YQKyNiGIKI/ZmPU7QvU72uREGR/Twklw36L1cwOfwWuAf34M4ae9JdqfdGCkI+1Q1IRhM ggkmfC8S5f9LaX7OFxq4nQw7KxDhxDtKZfjAJitEP7K7zmx42ItWxztbe3LUYDiZIejVcfJ3X /4lHKnt/tPnN0mzqOBWnIc3PvwjFU51eqjWtFwHsEl6SEEb4rJ9lWn81MtNr57qJTmYIOXSYc AQXT1CmTq/Z+zyL/Pme2Xy+HXEF6ryH+wtU5BA== Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org My previous bugfix was incomplete, we still have a broken kernel with CRYPTO_DEV_FSL_CAAM=m and CRYPTO_DEV_FSL_DPAA2_CAAM=y: drivers/crypto/caam/caamalg_desc.o: In function `cnstr_shdsc_aead_null_encap': caamalg_desc.c:(.text+0x14): undefined reference to `caam_little_end' drivers/crypto/caam/caamalg_desc.o: In function `cnstr_shdsc_aead_null_encap': caamalg_desc.c:(.text+0x310): undefined reference to `caam_imx' caamalg_desc.c:(.text+0x4a8): undefined reference to `caam_little_end' drivers/crypto/caam/caamalg_desc.o: In function `cnstr_shdsc_aead_null_encap': caamalg_desc.c:(.text+0x664): undefined reference to `caam_imx' Everything is fine for the other combinations: if both are loadable modules, or both are built-in, the flags work as expected, also if only one of the two is enabled. Add a dependency to enforce using one of the working configurations. Overall, I'm still not happy with that dependency, but for now it documents what the code requires. Fixes: 52813ab24959 ("crypto: caam/qi2 - avoid double export") Signed-off-by: Arnd Bergmann --- drivers/crypto/caam/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0 Reported-by: Arnd Bergmann Signed-off-by: Horia Geantă diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig index c4b1cade55c1..4dff65e518e7 100644 --- a/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig @@ -158,6 +158,7 @@ config CRYPTO_DEV_FSL_DPAA2_CAAM tristate "QorIQ DPAA2 CAAM (DPSECI) driver" depends on FSL_MC_DPIO depends on NETDEVICES + depends on CRYPTO_DEV_FSL_CAAM || !CRYPTO_DEV_FSL_CAAM select CRYPTO_DEV_FSL_CAAM_COMMON select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC