and remove CRYPTO_DEV_VMX, which looked redundant when only CRYPTO_DEV_VMX_ENCRYPT used it. Also it forces CRYPTO_GHASH to be builtin even CRYPTO_DEV_VMX_ENCRYPT was configured as module. Update powerpc defconfigs and description in MAINTAINERS. Signed-off-by: Petr Vorel <pvorel@xxxxxxx> --- new in v2 This might be a bit aggressive, but IMHO CRYPTO_DEV_VMX only complicated things for nothing. But if you do *not* agree with removing it, I just add select to drivers/crypto/vmx/Kconfig (which forces dependencies to be always modules.) If it's ok for you to remove, please also check whether the description is ok. get_maintainer.pl script has size limitation: $ ./scripts/get_maintainer.pl drivers/crypto/vmx/Kconfig ... linux-crypto@xxxxxxxxxxxxxxx (open list:IBM Power VMX Cryptographic Acceleration Instru...) maybe the name should be shorter. Kind regards, Petr MAINTAINERS | 2 +- arch/powerpc/configs/powernv_defconfig | 2 +- arch/powerpc/configs/ppc64_defconfig | 2 +- arch/powerpc/configs/pseries_defconfig | 2 +- drivers/crypto/Kconfig | 6 ------ drivers/crypto/vmx/Kconfig | 4 ++-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ea3e6c914384..80e562579180 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9207,7 +9207,7 @@ L: target-devel@xxxxxxxxxxxxxxx S: Supported F: drivers/scsi/ibmvscsi_tgt/ -IBM Power VMX Cryptographic instructions +IBM Power VMX Cryptographic Acceleration Instructions Driver M: Breno Leitão <leitao@xxxxxxxxxx> M: Nayna Jain <nayna@xxxxxxxxxxxxx> M: Paulo Flabiano Smorigo <pfsmorigo@xxxxxxxxx> diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig index 49f49c263935..4b250d05dcdf 100644 --- a/arch/powerpc/configs/powernv_defconfig +++ b/arch/powerpc/configs/powernv_defconfig @@ -337,7 +337,7 @@ CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_DEV_NX=y -CONFIG_CRYPTO_DEV_VMX=y +CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_VIRTUALIZATION=y CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=m diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index c8b0e80d613b..ebd33b94debb 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -355,7 +355,7 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_DEV_NX=y CONFIG_CRYPTO_DEV_NX_ENCRYPT=m -CONFIG_CRYPTO_DEV_VMX=y +CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_PRINTK_TIME=y CONFIG_PRINTK_CALLER=y CONFIG_MAGIC_SYSRQ=y diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index b571d084c148..304673817ef1 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -315,7 +315,7 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_DEV_NX=y CONFIG_CRYPTO_DEV_NX_ENCRYPT=m -CONFIG_CRYPTO_DEV_VMX=y +CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_VIRTUALIZATION=y CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64_HV=m diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 4f705674f94f..956f956607a5 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -761,12 +761,6 @@ config CRYPTO_DEV_QCOM_RNG To compile this driver as a module, choose M here. The module will be called qcom-rng. If unsure, say N. -config CRYPTO_DEV_VMX - bool "Support for VMX cryptographic acceleration instructions" - depends on PPC64 && VSX - help - Support for VMX cryptographic acceleration instructions. - source "drivers/crypto/vmx/Kconfig" config CRYPTO_DEV_IMGTEC_HASH diff --git a/drivers/crypto/vmx/Kconfig b/drivers/crypto/vmx/Kconfig index c85fab7ef0bd..1a3808b719f3 100644 --- a/drivers/crypto/vmx/Kconfig +++ b/drivers/crypto/vmx/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_DEV_VMX_ENCRYPT - tristate "Encryption acceleration support on P8 CPU" - depends on CRYPTO_DEV_VMX + tristate "Power VMX cryptographic acceleration instructions driver" + depends on PPC64 && VSX select CRYPTO_GHASH default m help -- 2.35.1
