Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp35413pxb; Mon, 11 Apr 2022 18:04:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQyrYIDbgrx+yDJlFnew3yXQAv/E1HC6VlELOwOvRgesONuzkJE4SyhAuggnYoWiaMVCvx X-Received: by 2002:a17:907:7da8:b0:6e0:5b94:5ed8 with SMTP id oz40-20020a1709077da800b006e05b945ed8mr30795552ejc.312.1649725488372; Mon, 11 Apr 2022 18:04:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649725488; cv=none; d=google.com; s=arc-20160816; b=jhjPhI6TaNdpNFTP4Rcobr2r2iJKzeiTaEQVT/vpJCsLmXLJSjHybg1L7qLgJI530l VqHOfBTgelvQXGLiyXFbpvrsOuO0ovx92VsC078xTtDJO7kb6Wy58D5nbZ/yayVkCdA8 XVkFeUXZhv6GEXDngYOVI6zC5K+KiY0/qf3nKW0OZfP0uJt4PF+CkcZUS9aKOnuahmIS ePCCQbMcks7Te9akVrj8SElNV+/dODflVbpuHC6EQYpenwjAkKZHmMZw9RuOMBt71hO3 1jHG0MoKS0mc9rWk/9FDmJ3P5Zd8zB0HyzOEj6Fg2k4764UB12IeF40iJAs2kQFkK/dp U1ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=uwNtDCkSWrBZPzWdZfYHMVdiHSdDSlr5h/bA5asRdUc=; b=eXu2QWmgtFpn1Eg/gPR9VcOkIqq8bx0xytaSEjawpUlwahuJcsVwKtZeZTi0Lk94Vy W/6ei1cmV7cWBMZBVvtxJYNpaD5199ZbER15KVB/wnNXeKD3F7l4Ix3zhJq3nB7JF+UL R/xT8NLRApCEAww34KtGwxd5UkT4hS+J8WR/YxOIVp6L3ppxChsoLE0IktDKFcj2IVxH eBYLrv0kzabMhdO5Ul9Oxd6JQFazkY0TOZ+UB04ehrkf3vlCHnXl97ozK+2mLQHEAOyF GIf9Ac1FsO1sjA+N4hkT09kwxucak6fJyBP9GSs8vFXxBz8BtZLoF6QzZ/DovgncG9ua /q8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v16-20020a50d590000000b00418eee96003si7472558edi.315.2022.04.11.18.04.24; Mon, 11 Apr 2022 18:04:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244479AbiDKDPf (ORCPT + 99 others); Sun, 10 Apr 2022 23:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241552AbiDKDPe (ORCPT ); Sun, 10 Apr 2022 23:15:34 -0400 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBBA72F3AE; Sun, 10 Apr 2022 20:13:21 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0V9ggjyY_1649646797; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0V9ggjyY_1649646797) by smtp.aliyun-inc.com(127.0.0.1); Mon, 11 Apr 2022 11:13:18 +0800 From: Tianjia Zhang To: Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , "Jason A . Donenfeld" , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation Date: Mon, 11 Apr 2022 11:13:13 +0800 Message-Id: <20220411031313.35449-1-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moved the sm4 library implementation from the lib/crypto directory to the crypto directory and configured the name as CRYPTO_SM4. The arm64 SM4 NEON/CE implementation depends on this and needs to be modified uniformly. Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation") Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation") Signed-off-by: Tianjia Zhang --- arch/arm64/crypto/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index 4fe7037d2347..ac85682c013c 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -57,13 +57,13 @@ config CRYPTO_SM4_ARM64_CE_BLK tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions" depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER - select CRYPTO_LIB_SM4 + select CRYPTO_SM4 config CRYPTO_SM4_ARM64_NEON_BLK tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions" depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER - select CRYPTO_LIB_SM4 + select CRYPTO_SM4 config CRYPTO_GHASH_ARM64_CE tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions" -- 2.24.3 (Apple Git-128)