Subject: [folded-merged] drivers-dma-remove-unused-support-for-memset-operations-v3.patch removed from -mm tree
To: b.zolnierkie@xxxxxxxxxxx,djbw@xxxxxx,herbert@xxxxxxxxxxxxxxxxxxx,khilman@xxxxxxxxxx,kyungmin.park@xxxxxxxxxxx,olof@xxxxxxxxx,t.figa@xxxxxxxxxxx,vinod.koul@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 03 Jul 2013 14:38:30 -0700
The patch titled
Subject: drivers-dma-remove-unused-support-for-memset-operations-v3
has been removed from the -mm tree. Its filename was
drivers-dma-remove-unused-support-for-memset-operations-v3.patch
This patch was dropped because it was folded into drivers-dma-remove-unused-support-for-memset-operations.patch
------------------------------------------------------
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Subject: drivers-dma-remove-unused-support-for-memset-operations-v3
This is an old patch that I ported to current kernels. I fixed rejects
and verified that it compiles for cases that hit rejects but unfortunately
I forgot to check for new code related to DMA_MEMSET functionality.
Fortunately it seems that the problematic places are in
plat-orion/common.c and mv_xor.c. They are fixed in the attached patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Vinod Koul <vinod.koul@xxxxxxxxx>
Cc: Dan Williams <djbw@xxxxxx>
Cc: Tomasz Figa <t.figa@xxxxxxxxxxx>
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Cc: Olof Johansson <olof@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/plat-orion/common.c | 5 -----
drivers/dma/mv_xor.c | 2 --
2 files changed, 7 deletions(-)
diff -puN arch/arm/plat-orion/common.c~drivers-dma-remove-unused-support-for-memset-operations-v3 arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c~drivers-dma-remove-unused-support-for-memset-operations-v3
+++ a/arch/arm/plat-orion/common.c
@@ -727,14 +727,9 @@ void __init orion_xor1_init(unsigned lon
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);
diff -puN drivers/dma/mv_xor.c~drivers-dma-remove-unused-support-for-memset-operations-v3 drivers/dma/mv_xor.c
--- a/drivers/dma/mv_xor.c~drivers-dma-remove-unused-support-for-memset-operations-v3
+++ a/drivers/dma/mv_xor.c
@@ -1244,8 +1244,6 @@ static int mv_xor_probe(struct platform_
dma_cap_set(DMA_MEMCPY, cap_mask);
if (of_property_read_bool(np, "dmacap,xor"))
dma_cap_set(DMA_XOR, cap_mask);
- if (of_property_read_bool(np, "dmacap,memset"))
- dma_cap_set(DMA_MEMSET, cap_mask);
if (of_property_read_bool(np, "dmacap,interrupt"))
dma_cap_set(DMA_INTERRUPT, cap_mask);
_
Patches currently in -mm which might be from b.zolnierkie@xxxxxxxxxxx are
drivers-dma-pl330c-fix-locking-in-pl330_free_chan_resources.patch
drivers-dma-remove-unused-support-for-memset-operations.patch
drivers-dma-remove-unused-support-for-memset-operations-v3-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
