Commit 10930333 authored by Danny Tsen's avatar Danny Tsen Committed by Herbert Xu
Browse files

crypto: vmx - Move to arch/powerpc/crypto 



Relocate all crypto files in vmx driver to arch/powerpc/crypto directory
and remove vmx directory.

drivers/crypto/vmx/aes.c rename to arch/powerpc/crypto/aes.c
drivers/crypto/vmx/aes_cbc.c rename to arch/powerpc/crypto/aes_cbc.c
drivers/crypto/vmx/aes_ctr.c rename to arch/powerpc/crypto/aes_ctr.c
drivers/crypto/vmx/aes_xts.c rename to arch/powerpc/crypto/aes_xts.c
drivers/crypto/vmx/aesp8-ppc.h rename to arch/powerpc/crypto/aesp8-ppc.h
drivers/crypto/vmx/aesp8-ppc.pl rename to arch/powerpc/crypto/aesp8-ppc.pl
drivers/crypto/vmx/ghash.c rename to arch/powerpc/crypto/ghash.c
drivers/crypto/vmx/ghashp8-ppc.pl rename to arch/powerpc/crypto/ghashp8-ppc.pl
drivers/crypto/vmx/vmx.c rename to arch/powerpc/crypto/vmx.c

deleted files:
drivers/crypto/vmx/Makefile
drivers/crypto/vmx/Kconfig
drivers/crypto/vmx/ppc-xlate.pl

This patch has been tested has passed the selftest.  The patch is also tested with
CONFIG_CRYPTO_MANAGER_EXTRA_TESTS enabled.

Signed-off-by: default avatarDanny Tsen <dtsen@linux.ibm.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e01966e6

arch/powerpc/crypto/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -137,4 +137,24 @@ config CRYPTO_POLY1305_P10 
	  - Power10 or later

	  - Little-endian



config CRYPTO_DEV_VMX

        bool "Support for VMX cryptographic acceleration instructions"

        depends on PPC64 && VSX

        help

          Support for VMX cryptographic acceleration instructions.



config CRYPTO_DEV_VMX_ENCRYPT

	tristate "Encryption acceleration support on P8 CPU"

	depends on CRYPTO_DEV_VMX

	select CRYPTO_AES

	select CRYPTO_CBC

	select CRYPTO_CTR

	select CRYPTO_GHASH

	select CRYPTO_XTS

	default m

	help

	  Support for VMX cryptographic acceleration instructions on Power8 CPU.

	  This module supports acceleration for AES and GHASH in hardware. If you

	  choose 'M' here, this module will be called vmx-crypto.



endmenu

arch/powerpc/crypto/Makefile

+18 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_CRYPTO_VPMSUM_TESTER) += crc-vpmsum_test.o 
obj-$(CONFIG_CRYPTO_AES_GCM_P10) += aes-gcm-p10-crypto.o

obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o

obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o

obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o



aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes-spe-glue.o

md5-ppc-y := md5-asm.o md5-glue.o
@@ -27,14 +28,29 @@ crct10dif-vpmsum-y := crct10dif-vpmsum_asm.o crct10dif-vpmsum_glue.o 
aes-gcm-p10-crypto-y := aes-gcm-p10-glue.o aes-gcm-p10.o ghashp10-ppc.o aesp10-ppc.o

chacha-p10-crypto-y := chacha-p10-glue.o chacha-p10le-8x.o

poly1305-p10-crypto-y := poly1305-p10-glue.o poly1305-p10le_64.o

vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o



ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

override flavour := linux-ppc64le

else

ifdef CONFIG_PPC64_ELF_ABI_V2

override flavour := linux-ppc64-elfv2

else

override flavour := linux-ppc64

endif

endif



quiet_cmd_perl = PERL    $@

      cmd_perl = $(PERL) $< $(if $(CONFIG_CPU_LITTLE_ENDIAN), linux-ppc64le, linux-ppc64) > $@

      cmd_perl = $(PERL) $< $(flavour) > $@



targets += aesp10-ppc.S ghashp10-ppc.S

targets += aesp10-ppc.S ghashp10-ppc.S aesp8-ppc.S ghashp8-ppc.S



$(obj)/aesp10-ppc.S $(obj)/ghashp10-ppc.S: $(obj)/%.S: $(src)/%.pl FORCE

	$(call if_changed,perl)



$(obj)/aesp8-ppc.S $(obj)/ghashp8-ppc.S: $(obj)/%.S: $(src)/%.pl FORCE

	$(call if_changed,perl)



OBJECT_FILES_NON_STANDARD_aesp10-ppc.o := y

OBJECT_FILES_NON_STANDARD_ghashp10-ppc.o := y

OBJECT_FILES_NON_STANDARD_aesp8-ppc.o := y