Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 322cacce authored by Seth Jennings's avatar Seth Jennings Committed by Herbert Xu
Browse files

powerpc/crypto: rework Kconfig 



This patch creates a new submenu for the NX cryptographic
hardware accelerator and breaks the NX options into their own
Kconfig file under drivers/crypto/nx/Kconfig.

This will permit additional NX functionality to be easily
and more cleanly added in the future without touching
drivers/crypto/Makefile|Kconfig.

Signed-off-by: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 61bb86bb

arch/powerpc/configs/ppc64_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_LZO=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

CONFIG_CRYPTO_DEV_NX=m

CONFIG_CRYPTO_DEV_NX=y

CONFIG_CRYPTO_DEV_NX_ENCRYPT=m

CONFIG_VIRTUALIZATION=y

CONFIG_KVM_BOOK3S_64=m

CONFIG_KVM_BOOK3S_64_HV=y

arch/powerpc/configs/pseries_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_LZO=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

CONFIG_CRYPTO_DEV_NX=m

CONFIG_CRYPTO_DEV_NX=y

CONFIG_CRYPTO_DEV_NX_ENCRYPT=m

CONFIG_VIRTUALIZATION=y

CONFIG_KVM_BOOK3S_64=m

CONFIG_KVM_BOOK3S_64_HV=y

drivers/crypto/Kconfig

+7 −13
Original line number Diff line number Diff line
@@ -298,21 +298,15 @@ config CRYPTO_DEV_TEGRA_AES 
	  will be called tegra-aes.



config CRYPTO_DEV_NX

	tristate "Support for Power7+ in-Nest cryptographic acceleration"

	bool "Support for IBM Power7+ in-Nest cryptographic acceleration"

	depends on PPC64 && IBMVIO

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_CCM

	select CRYPTO_GCM

	select CRYPTO_AUTHENC

	select CRYPTO_XCBC

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	default n

	help

	  Support for Power7+ in-Nest cryptographic acceleration. This

	  module supports acceleration for AES and SHA2 algorithms. If you

	  choose 'M' here, this module will be called nx_crypto.

	  Support for Power7+ in-Nest cryptographic acceleration.



if CRYPTO_DEV_NX

	source "drivers/crypto/nx/Kconfig"

endif



config CRYPTO_DEV_UX500

	tristate "Driver for ST-Ericsson UX500 crypto hardware acceleration"

drivers/crypto/nx/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
config CRYPTO_DEV_NX_ENCRYPT

	tristate "Encryption acceleration support"

	depends on PPC64 && IBMVIO

	default y

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_CCM

	select CRYPTO_GCM

	select CRYPTO_AUTHENC

	select CRYPTO_XCBC

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	help

	  Support for Power7+ in-Nest encryption acceleration. This

	  module supports acceleration for AES and SHA2 algorithms. If you

	  choose 'M' here, this module will be called nx_crypto.

drivers/crypto/nx/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CRYPTO_DEV_NX) += nx-crypto.o

obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o

nx-crypto-objs := nx.o \

		  nx_debugfs.o \

		  nx-aes-cbc.o \