Commit 00807191 authored by Eric Biggers's avatar Eric Biggers
Browse files

s390/crc32: expose CRC32 functions through lib 



Move the s390 CRC32 assembly code into the lib directory and wire it up
to the library interface.  This allows it to be used without going
through the crypto API.  It remains usable via the crypto API too via
the shash algorithms that use the library interface.  Thus all the
arch-specific "shash" code becomes unnecessary and is removed.

Note: to see the diff from arch/s390/crypto/crc32-vx.c to
arch/s390/lib/crc32-glue.c, view this commit with 'git show -M10'.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20241202010844.144356-10-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 372ff60a

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config S390 
	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2

	select ARCH_HAS_CRC32

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE

arch/s390/configs/debug_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -795,7 +795,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

arch/s390/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -782,7 +782,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

arch/s390/crypto/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -2,18 +2,6 @@ 


menu "Accelerated Cryptographic Algorithms for CPU (s390)"



config CRYPTO_CRC32_S390

	tristate "CRC32c and CRC32"

	depends on S390

	select CRYPTO_HASH

	select CRC32

	help

	  CRC32c and CRC32 CRC algorithms



	  Architecture: s390



	  It is available with IBM z13 or later.



config CRYPTO_SHA512_S390

	tristate "Hash functions: SHA-384 and SHA-512"

	depends on S390

arch/s390/crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ obj-$(CONFIG_CRYPTO_PAES_S390) += paes_s390.o 
obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o

obj-$(CONFIG_S390_PRNG) += prng.o

obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o

obj-$(CONFIG_CRYPTO_CRC32_S390) += crc32-vx_s390.o

obj-$(CONFIG_CRYPTO_HMAC_S390) += hmac_s390.o

obj-y += arch_random.o



crc32-vx_s390-y := crc32-vx.o crc32le-vx.o crc32be-vx.o

chacha_s390-y := chacha-glue.o chacha-s390.o