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

Commit 27b43fd9 authored by Boris Brezillon's avatar Boris Brezillon Committed by Herbert Xu
Browse files

crypto: marvell - Remove the old mv_cesa driver 



All defconfigs selecting the old driver have been patched to select
the new one instead. We can now remove the old driver along with the
allhwsupports module parameter in the new driver that was used to
check whether the new driver was allowed to take control of the CESA
engine or not.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 729ec4c5

drivers/crypto/Kconfig

+3 −19
Original line number Diff line number Diff line
@@ -199,22 +199,8 @@ config CRYPTO_CRC32_S390 


	  It is available with IBM z13 or later.



config CRYPTO_DEV_MV_CESA

	tristate "Marvell's Cryptographic Engine"

	depends on PLAT_ORION

	select CRYPTO_AES

	select CRYPTO_BLKCIPHER

	select CRYPTO_HASH

	select SRAM

	help

	  This driver allows you to utilize the Cryptographic Engines and

	  Security Accelerator (CESA) which can be found on the Marvell Orion

	  and Kirkwood SoCs, such as QNAP's TS-209.



	  Currently the driver supports AES in ECB and CBC mode without DMA.



config CRYPTO_DEV_MARVELL_CESA

	tristate "New Marvell's Cryptographic Engine driver"

	tristate "Marvell's Cryptographic Engine driver"

	depends on PLAT_ORION || ARCH_MVEBU

	select CRYPTO_AES

	select CRYPTO_DES
@@ -223,12 +209,10 @@ config CRYPTO_DEV_MARVELL_CESA 
	select SRAM

	help

	  This driver allows you to utilize the Cryptographic Engines and

	  Security Accelerator (CESA) which can be found on the Armada 370.

	  Security Accelerator (CESA) which can be found on MVEBU and ORION

	  platforms.

	  This driver supports CPU offload through DMA transfers.



	  This driver is aimed at replacing the mv_cesa driver. This will only

	  happen once it has received proper testing.



config CRYPTO_DEV_NIAGARA2

       tristate "Niagara2 Stream Processing Unit driver"

       select CRYPTO_DES

drivers/crypto/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o 
obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o

obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o

obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o

obj-$(CONFIG_CRYPTO_DEV_MV_CESA) += mv_cesa.o

obj-$(CONFIG_CRYPTO_DEV_MARVELL_CESA) += marvell/

obj-$(CONFIG_CRYPTO_DEV_MEDIATEK) += mediatek/

obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) += mxs-dcp.o

drivers/crypto/marvell/cesa.c

+0 −7
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ 
/* Limit of the crypto queue before reaching the backlog */

#define CESA_CRYPTO_DEFAULT_MAX_QLEN 128



static int allhwsupport = !IS_ENABLED(CONFIG_CRYPTO_DEV_MV_CESA);

module_param_named(allhwsupport, allhwsupport, int, 0444);

MODULE_PARM_DESC(allhwsupport, "Enable support for all hardware (even it if overlaps with the mv_cesa driver)");



struct mv_cesa_dev *cesa_dev;



struct crypto_async_request *
@@ -457,9 +453,6 @@ static int mv_cesa_probe(struct platform_device *pdev) 
		caps = match->data;

	}



	if ((caps == &orion_caps || caps == &kirkwood_caps) && !allhwsupport)

		return -ENOTSUPP;



	cesa = devm_kzalloc(dev, sizeof(*cesa), GFP_KERNEL);

	if (!cesa)

		return -ENOMEM;