From patchwork Mon May 25 04:45:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Bur X-Patchwork-Id: 6472571 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8D8559F1C1 for ; Mon, 25 May 2015 04:46:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D26B920460 for ; Mon, 25 May 2015 04:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1A81204D5 for ; Mon, 25 May 2015 04:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750898AbbEYEqn (ORCPT ); Mon, 25 May 2015 00:46:43 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:57174 "EHLO e23smtp05.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbbEYEqm (ORCPT ); Mon, 25 May 2015 00:46:42 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 25 May 2015 14:46:39 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 25 May 2015 14:46:35 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id C1B062BB0057 for ; Mon, 25 May 2015 14:46:34 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4P4kQlc22085708 for ; Mon, 25 May 2015 14:46:34 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4P4k26f024128 for ; Mon, 25 May 2015 14:46:02 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t4P4k1l0023264; Mon, 25 May 2015 14:46:02 +1000 Received: from cyril.ozlabs.ibm.com (unknown [9.192.254.114]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 9DF38A0321; Mon, 25 May 2015 14:45:37 +1000 (AEST) From: Cyril Bur To: Herbert Xu Cc: Marcelo Henrique Cerri , Fionnuala Gunter , linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] crypto: nx - tweak Makefile dependencies Date: Mon, 25 May 2015 14:45:16 +1000 Message-Id: <1432529116-21279-1-git-send-email-cyrilbur@gmail.com> X-Mailer: git-send-email 1.9.1 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15052504-0017-0000-0000-0000014AFF86 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Selecting CRYPTO_DEV_NX causes a conditional include of nx/Kconfig but options within nx/Kconfig do not depend on it. The included options should depend on CRYPTO_DEV_NX since currently CRYPTO_DEV_NX cannot be built for little endian. While Kconfig appears to understand this convoluted dependency situation, it isn't explicitly stated. This patch addresses the missing dependencies for CRYPTO_DEV_NX_ENCRYPT and CRYPTO_DEV_NX_COMPRESS which should depend on CRYPTO_DEV_NX. It also makes more sense to put all three options into the nx/Kconfig file and have the file included unconditionally. CC: Marcelo Henrique Cerri CC: Fionnuala Gunter CC: linux-crypto@vger.kernel.org CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Cyril Bur --- drivers/crypto/Kconfig | 11 +---------- drivers/crypto/nx/Kconfig | 11 +++++++++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 033c0c8..cc96a7d 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -311,16 +311,7 @@ config CRYPTO_DEV_S5P Select this to offload Samsung S5PV210 or S5PC110, Exynos from AES algorithms execution. -config CRYPTO_DEV_NX - bool "Support for IBM Power7+ in-Nest cryptographic acceleration" - depends on PPC64 && IBMVIO && !CPU_LITTLE_ENDIAN - default n - help - Support for Power7+ in-Nest cryptographic acceleration. - -if CRYPTO_DEV_NX - source "drivers/crypto/nx/Kconfig" -endif +source "drivers/crypto/nx/Kconfig" config CRYPTO_DEV_UX500 tristate "Driver for ST-Ericsson UX500 crypto hardware acceleration" diff --git a/drivers/crypto/nx/Kconfig b/drivers/crypto/nx/Kconfig index f826166..0726f12 100644 --- a/drivers/crypto/nx/Kconfig +++ b/drivers/crypto/nx/Kconfig @@ -1,6 +1,13 @@ +config CRYPTO_DEV_NX + bool "Support for IBM Power7+ in-Nest cryptographic acceleration" + depends on PPC64 && IBMVIO && !CPU_LITTLE_ENDIAN + default n + help + Support for Power7+ in-Nest cryptographic acceleration. + config CRYPTO_DEV_NX_ENCRYPT tristate "Encryption acceleration support" - depends on PPC64 && IBMVIO + depends on CRYPTO_DEV_NX default y select CRYPTO_AES select CRYPTO_CBC @@ -18,7 +25,7 @@ config CRYPTO_DEV_NX_ENCRYPT config CRYPTO_DEV_NX_COMPRESS tristate "Compression acceleration support" - depends on PPC64 && IBMVIO + depends on CRYPTO_DEV_NX default y help Support for Power7+ in-Nest compression acceleration. This