Commit 48a9db46 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds
Browse files

drivers/dma: remove unused support for MEMSET operations 



There have never been any real users of MEMSET operations since they
have been introduced in January 2007 by commit 7405f74b ("dmaengine:
refactor dmaengine around dma_async_tx_descriptor").  Therefore remove
support for them for now, it can be always brought back when needed.

[sebastian.hesselbarth@gmail.com: fix drivers/dma/mv_xor]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Acked-by: default avatarDan Williams <djbw@fb.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Olof Johansson <olof@lixom.net>
Cc: Kevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcf6d294

Documentation/crypto/async-tx-api.txt

+0 −1
Original line number Diff line number Diff line
@@ -222,5 +222,4 @@ drivers/dma/: location for offload engine drivers 
include/linux/async_tx.h: core header file for the async_tx api

crypto/async_tx/async_tx.c: async_tx interface to dmaengine and common code

crypto/async_tx/async_memcpy.c: copy offload

crypto/async_tx/async_memset.c: memory fill offload

crypto/async_tx/async_xor.c: xor and xor zero sum offload

arch/arm/mach-iop13xx/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ void __init iop13xx_platform_init(void) 
			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			break;

		case IOP13XX_INIT_ADMA_1:
@@ -479,7 +478,6 @@ void __init iop13xx_platform_init(void) 
			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			break;

		case IOP13XX_INIT_ADMA_2:
@@ -489,7 +487,6 @@ void __init iop13xx_platform_init(void) 
			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			dma_cap_set(DMA_PQ, plat_data->cap_mask);

			dma_cap_set(DMA_PQ_VAL, plat_data->cap_mask);

arch/arm/plat-iop/adma.c

+0 −2
Original line number Diff line number Diff line
@@ -192,12 +192,10 @@ static int __init iop3xx_adma_cap_init(void) 


	#ifdef CONFIG_ARCH_IOP32X /* the 32x AAU does not perform zero sum */

	dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);

	dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);

	#else

	dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);

	dma_cap_set(DMA_XOR_VAL, iop3xx_aau_data.cap_mask);

	dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);

	#endif

arch/arm/plat-orion/common.c

+0 −10
Original line number Diff line number Diff line
@@ -666,14 +666,9 @@ void __init orion_xor0_init(unsigned long mapbase_low, 
	orion_xor0_shared_resources[3].start = irq_1;

	orion_xor0_shared_resources[3].end = irq_1;



	/*

	 * two engines can't do memset simultaneously, this limitation

	 * satisfied by removing memset support from one of the engines.

	 */

	dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[0].cap_mask);

	dma_cap_set(DMA_XOR, orion_xor0_channels_data[0].cap_mask);



	dma_cap_set(DMA_MEMSET, orion_xor0_channels_data[1].cap_mask);

	dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[1].cap_mask);

	dma_cap_set(DMA_XOR, orion_xor0_channels_data[1].cap_mask);
@@ -732,14 +727,9 @@ void __init orion_xor1_init(unsigned long mapbase_low, 
	orion_xor1_shared_resources[3].start = irq_1;

	orion_xor1_shared_resources[3].end = irq_1;



	/*

	 * two engines can't do memset simultaneously, this limitation

	 * satisfied by removing memset support from one of the engines.

	 */

	dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[0].cap_mask);

	dma_cap_set(DMA_XOR, orion_xor1_channels_data[0].cap_mask);



	dma_cap_set(DMA_MEMSET, orion_xor1_channels_data[1].cap_mask);

	dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[1].cap_mask);

	dma_cap_set(DMA_XOR, orion_xor1_channels_data[1].cap_mask);

crypto/async_tx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ config ASYNC_XOR 
	select ASYNC_CORE

	select XOR_BLOCKS



config ASYNC_MEMSET

	tristate

	select ASYNC_CORE



config ASYNC_PQ

	tristate

	select ASYNC_CORE

CRA Git | Maintained and supported by SUSTech CRA and CCSE