linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
@ 2013-07-01 14:56 Sebastian Hesselbarth
  2013-07-01 15:04 ` Jason Cooper
  0 siblings, 1 reply; 10+ messages in thread
From: Sebastian Hesselbarth @ 2013-07-01 14:56 UTC (permalink / raw)
  To: linux-arm-kernel

Commit 834cbfe966bece50afded79da8e975d255bf0772
 ("drivers/dma: remove unused support for MEMSET operations")
removes MEMSET from dmaengine but does not completely removes it from
Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
This also fixes some compiler warnings about now obsolete functions by
removing those.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
 arch/arm/plat-orion/common.c |    6 ------
 drivers/dma/mv_xor.c         |   25 +------------------------
 2 files changed, 1 insertions(+), 30 deletions(-)

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 797f284..dd2cbd3 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -727,14 +727,8 @@ 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);
 
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index c434fe6..200f1a3 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -89,11 +89,6 @@ static void mv_desc_clear_next_desc(struct mv_xor_desc_slot *desc)
 	hw_desc->phy_next_desc = 0;
 }
 
-static void mv_desc_set_block_fill_val(struct mv_xor_desc_slot *desc, u32 val)
-{
-	desc->value = val;
-}
-
 static void mv_desc_set_dest_addr(struct mv_xor_desc_slot *desc,
 				  dma_addr_t addr)
 {
@@ -128,22 +123,6 @@ static void mv_chan_set_next_descriptor(struct mv_xor_chan *chan,
 	__raw_writel(next_desc_addr, XOR_NEXT_DESC(chan));
 }
 
-static void mv_chan_set_dest_pointer(struct mv_xor_chan *chan, u32 desc_addr)
-{
-	__raw_writel(desc_addr, XOR_DEST_POINTER(chan));
-}
-
-static void mv_chan_set_block_size(struct mv_xor_chan *chan, u32 block_size)
-{
-	__raw_writel(block_size, XOR_BLOCK_SIZE(chan));
-}
-
-static void mv_chan_set_value(struct mv_xor_chan *chan, u32 value)
-{
-	__raw_writel(value, XOR_INIT_VALUE_LOW(chan));
-	__raw_writel(value, XOR_INIT_VALUE_HIGH(chan));
-}
-
 static void mv_chan_unmask_interrupts(struct mv_xor_chan *chan)
 {
 	u32 val = __raw_readl(XOR_INTR_MASK(chan));
@@ -1134,7 +1113,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
 			goto err_free_irq;
 	}
 
-	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s%s)\n",
+	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s)\n",
 		 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
 		 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
 		 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
@@ -1244,8 +1223,6 @@ static int mv_xor_probe(struct platform_device *pdev)
 				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);
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 14:56 [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal Sebastian Hesselbarth
@ 2013-07-01 15:04 ` Jason Cooper
  2013-07-01 15:14   ` Sebastian Hesselbarth
  2013-07-01 19:42   ` Andrew Morton
  0 siblings, 2 replies; 10+ messages in thread
From: Jason Cooper @ 2013-07-01 15:04 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
> Commit 834cbfe966bece50afded79da8e975d255bf0772
>  ("drivers/dma: remove unused support for MEMSET operations")
> removes MEMSET from dmaengine but does not completely removes it from
> Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
> This also fixes some compiler warnings about now obsolete functions by
> removing those.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  arch/arm/plat-orion/common.c |    6 ------
>  drivers/dma/mv_xor.c         |   25 +------------------------
>  2 files changed, 1 insertions(+), 30 deletions(-)

Please take a look at the email from lkml I just forwarded to you.  I
believe this solves your problem, but I don't have time to look closely
atm.

thx,

Jason.

> 
> diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
> index 797f284..dd2cbd3 100644
> --- a/arch/arm/plat-orion/common.c
> +++ b/arch/arm/plat-orion/common.c
> @@ -727,14 +727,8 @@ 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);
>  
> diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
> index c434fe6..200f1a3 100644
> --- a/drivers/dma/mv_xor.c
> +++ b/drivers/dma/mv_xor.c
> @@ -89,11 +89,6 @@ static void mv_desc_clear_next_desc(struct mv_xor_desc_slot *desc)
>  	hw_desc->phy_next_desc = 0;
>  }
>  
> -static void mv_desc_set_block_fill_val(struct mv_xor_desc_slot *desc, u32 val)
> -{
> -	desc->value = val;
> -}
> -
>  static void mv_desc_set_dest_addr(struct mv_xor_desc_slot *desc,
>  				  dma_addr_t addr)
>  {
> @@ -128,22 +123,6 @@ static void mv_chan_set_next_descriptor(struct mv_xor_chan *chan,
>  	__raw_writel(next_desc_addr, XOR_NEXT_DESC(chan));
>  }
>  
> -static void mv_chan_set_dest_pointer(struct mv_xor_chan *chan, u32 desc_addr)
> -{
> -	__raw_writel(desc_addr, XOR_DEST_POINTER(chan));
> -}
> -
> -static void mv_chan_set_block_size(struct mv_xor_chan *chan, u32 block_size)
> -{
> -	__raw_writel(block_size, XOR_BLOCK_SIZE(chan));
> -}
> -
> -static void mv_chan_set_value(struct mv_xor_chan *chan, u32 value)
> -{
> -	__raw_writel(value, XOR_INIT_VALUE_LOW(chan));
> -	__raw_writel(value, XOR_INIT_VALUE_HIGH(chan));
> -}
> -
>  static void mv_chan_unmask_interrupts(struct mv_xor_chan *chan)
>  {
>  	u32 val = __raw_readl(XOR_INTR_MASK(chan));
> @@ -1134,7 +1113,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
>  			goto err_free_irq;
>  	}
>  
> -	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s%s)\n",
> +	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s)\n",
>  		 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
>  		 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
>  		 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
> @@ -1244,8 +1223,6 @@ static int mv_xor_probe(struct platform_device *pdev)
>  				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);
>  
> -- 
> 1.7.2.5
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 15:04 ` Jason Cooper
@ 2013-07-01 15:14   ` Sebastian Hesselbarth
  2013-07-01 15:17     ` Jason Cooper
  2013-07-01 19:42   ` Andrew Morton
  1 sibling, 1 reply; 10+ messages in thread
From: Sebastian Hesselbarth @ 2013-07-01 15:14 UTC (permalink / raw)
  To: linux-arm-kernel

On 07/01/13 17:04, Jason Cooper wrote:
> On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
>> Commit 834cbfe966bece50afded79da8e975d255bf0772
>>   ("drivers/dma: remove unused support for MEMSET operations")
>> removes MEMSET from dmaengine but does not completely removes it from
>> Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
>> This also fixes some compiler warnings about now obsolete functions by
>> removing those.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> ---
>> Cc: Jason Cooper <jason@lakedaemon.net>
>> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
>> Cc: Kyungmin Park <kyungmin.park@samsung.com>
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>> Cc: linux-arm-kernel at lists.infradead.org
>> Cc: linux-kernel at vger.kernel.org
>> ---
>>   arch/arm/plat-orion/common.c |    6 ------
>>   drivers/dma/mv_xor.c         |   25 +------------------------
>>   2 files changed, 1 insertions(+), 30 deletions(-)
>
> Please take a look at the email from lkml I just forwarded to you.  I
> believe this solves your problem, but I don't have time to look closely
> atm.

Jason,

I have seen the forwarded patch before. I don't know what version this
is based on. Some of the modifications are in next-20130701, some are
not. I have stripped the Marvell modifications from the patch you
forwarded and fixed all remaining issues.

Also, I will sent a follow-up patch to remove memset references from
Marvell SoC dts/dtsi and the binding documentation soon.

I guess, Bartolomiej should pick them up and resend his patch set, or
leave Marvell alone and you pick them up.

Sebastian

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 15:14   ` Sebastian Hesselbarth
@ 2013-07-01 15:17     ` Jason Cooper
  2013-07-01 17:24       ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 10+ messages in thread
From: Jason Cooper @ 2013-07-01 15:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jul 01, 2013 at 05:14:25PM +0200, Sebastian Hesselbarth wrote:
> On 07/01/13 17:04, Jason Cooper wrote:
> >On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
> >>Commit 834cbfe966bece50afded79da8e975d255bf0772
> >>  ("drivers/dma: remove unused support for MEMSET operations")
> >>removes MEMSET from dmaengine but does not completely removes it from
> >>Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
> >>This also fixes some compiler warnings about now obsolete functions by
> >>removing those.
> >>
> >>Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >>---
> >>Cc: Jason Cooper <jason@lakedaemon.net>
> >>Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> >>Cc: Kyungmin Park <kyungmin.park@samsung.com>
> >>Cc: Andrew Morton <akpm@linux-foundation.org>
> >>Cc: linux-arm-kernel at lists.infradead.org
> >>Cc: linux-kernel at vger.kernel.org
> >>---
> >>  arch/arm/plat-orion/common.c |    6 ------
> >>  drivers/dma/mv_xor.c         |   25 +------------------------
> >>  2 files changed, 1 insertions(+), 30 deletions(-)
> >
> >Please take a look at the email from lkml I just forwarded to you.  I
> >believe this solves your problem, but I don't have time to look closely
> >atm.
> 
> Jason,
> 
> I have seen the forwarded patch before. I don't know what version this
> is based on. Some of the modifications are in next-20130701, some are
> not. I have stripped the Marvell modifications from the patch you
> forwarded and fixed all remaining issues.
> 
> Also, I will sent a follow-up patch to remove memset references from
> Marvell SoC dts/dtsi and the binding documentation soon.
> 
> I guess, Bartolomiej should pick them up and resend his patch set, or
> leave Marvell alone and you pick them up.

If Bartolomiej doesn't take it, please split your changes into two
patches, one for plat-orion, and one for drivers.

thx,

Jason.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 15:17     ` Jason Cooper
@ 2013-07-01 17:24       ` Bartlomiej Zolnierkiewicz
  2013-07-01 17:29         ` Sebastian Hesselbarth
  0 siblings, 1 reply; 10+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2013-07-01 17:24 UTC (permalink / raw)
  To: linux-arm-kernel


Hi,

On Monday, July 01, 2013 11:17:20 AM Jason Cooper wrote:
> On Mon, Jul 01, 2013 at 05:14:25PM +0200, Sebastian Hesselbarth wrote:
> > On 07/01/13 17:04, Jason Cooper wrote:
> > >On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
> > >>Commit 834cbfe966bece50afded79da8e975d255bf0772
> > >>  ("drivers/dma: remove unused support for MEMSET operations")
> > >>removes MEMSET from dmaengine but does not completely removes it from
> > >>Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
> > >>This also fixes some compiler warnings about now obsolete functions by
> > >>removing those.
> > >>
> > >>Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > >>---
> > >>Cc: Jason Cooper <jason@lakedaemon.net>
> > >>Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > >>Cc: Kyungmin Park <kyungmin.park@samsung.com>
> > >>Cc: Andrew Morton <akpm@linux-foundation.org>
> > >>Cc: linux-arm-kernel at lists.infradead.org
> > >>Cc: linux-kernel at vger.kernel.org
> > >>---
> > >>  arch/arm/plat-orion/common.c |    6 ------
> > >>  drivers/dma/mv_xor.c         |   25 +------------------------
> > >>  2 files changed, 1 insertions(+), 30 deletions(-)
> > >
> > >Please take a look at the email from lkml I just forwarded to you.  I
> > >believe this solves your problem, but I don't have time to look closely
> > >atm.
> > 
> > Jason,
> > 
> > I have seen the forwarded patch before. I don't know what version this
> > is based on. Some of the modifications are in next-20130701, some are
> > not. I have stripped the Marvell modifications from the patch you
> > forwarded and fixed all remaining issues.
> > 
> > Also, I will sent a follow-up patch to remove memset references from
> > Marvell SoC dts/dtsi and the binding documentation soon.
> > 
> > I guess, Bartolomiej should pick them up and resend his patch set, or
> > leave Marvell alone and you pick them up.
> 
> If Bartolomiej doesn't take it, please split your changes into two
> patches, one for plat-orion, and one for drivers.

Andrew has already applied incremental patch fixing build problems to his
tree (though it is not yet in linux-next):

	http://www.ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations-v3.patch

The rest of changes from Sebastian are contained in another incremental
patch which I've attached to this mail. They can be also folded into
the first patch (which is what Andrew will probably do before sending them
to Linus).

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: [PATCH] DMA: Fix mv_xor after MEMSET removal

Commit 834cbfe ("drivers/dma: remove unused support for MEMSET operations")
removes MEMSET from dmaengine but does not completely removes it from
drivers/dma/mv_xor.

This also fixes some compiler warnings about now obsolete functions by
removing those.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
[bzolnier: splitted off changes from bigger patch]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 drivers/dma/mv_xor.c |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

Index: b/drivers/dma/mv_xor.c
===================================================================
--- a/drivers/dma/mv_xor.c	2013-07-01 18:53:12.113317468 +0200
+++ b/drivers/dma/mv_xor.c	2013-07-01 18:56:07.273317119 +0200
@@ -89,11 +89,6 @@ static void mv_desc_clear_next_desc(stru
 	hw_desc->phy_next_desc = 0;
 }
 
-static void mv_desc_set_block_fill_val(struct mv_xor_desc_slot *desc, u32 val)
-{
-	desc->value = val;
-}
-
 static void mv_desc_set_dest_addr(struct mv_xor_desc_slot *desc,
 				  dma_addr_t addr)
 {
@@ -128,22 +123,6 @@ static void mv_chan_set_next_descriptor(
 	__raw_writel(next_desc_addr, XOR_NEXT_DESC(chan));
 }
 
-static void mv_chan_set_dest_pointer(struct mv_xor_chan *chan, u32 desc_addr)
-{
-	__raw_writel(desc_addr, XOR_DEST_POINTER(chan));
-}
-
-static void mv_chan_set_block_size(struct mv_xor_chan *chan, u32 block_size)
-{
-	__raw_writel(block_size, XOR_BLOCK_SIZE(chan));
-}
-
-static void mv_chan_set_value(struct mv_xor_chan *chan, u32 value)
-{
-	__raw_writel(value, XOR_INIT_VALUE_LOW(chan));
-	__raw_writel(value, XOR_INIT_VALUE_HIGH(chan));
-}
-
 static void mv_chan_unmask_interrupts(struct mv_xor_chan *chan)
 {
 	u32 val = __raw_readl(XOR_INTR_MASK(chan));
@@ -1134,7 +1113,7 @@ mv_xor_channel_add(struct mv_xor_device
 			goto err_free_irq;
 	}
 
-	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s%s)\n",
+	dev_info(&pdev->dev, "Marvell XOR: ( %s%s%s)\n",
 		 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
 		 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
 		 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 17:24       ` Bartlomiej Zolnierkiewicz
@ 2013-07-01 17:29         ` Sebastian Hesselbarth
  0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Hesselbarth @ 2013-07-01 17:29 UTC (permalink / raw)
  To: linux-arm-kernel

On 07/01/13 19:24, Bartlomiej Zolnierkiewicz wrote:
> On Monday, July 01, 2013 11:17:20 AM Jason Cooper wrote:
>> On Mon, Jul 01, 2013 at 05:14:25PM +0200, Sebastian Hesselbarth wrote:
>>> On 07/01/13 17:04, Jason Cooper wrote:
>>>> On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
>>> Also, I will sent a follow-up patch to remove memset references from
>>> Marvell SoC dts/dtsi and the binding documentation soon.
>>>
>>> I guess, Bartolomiej should pick them up and resend his patch set, or
>>> leave Marvell alone and you pick them up.
>>
>> If Bartolomiej doesn't take it, please split your changes into two
>> patches, one for plat-orion, and one for drivers.
>
> Andrew has already applied incremental patch fixing build problems to his
> tree (though it is not yet in linux-next):
>
> 	http://www.ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations-v3.patch
>
> The rest of changes from Sebastian are contained in another incremental
> patch which I've attached to this mail. They can be also folded into
> the first patch (which is what Andrew will probably do before sending them
> to Linus).

Ok, great! Then I will sent the DT clean-up patches to be taken through
Jason's tree with the other stuff I have for v3.11-rc1.

Sebastian

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 15:04 ` Jason Cooper
  2013-07-01 15:14   ` Sebastian Hesselbarth
@ 2013-07-01 19:42   ` Andrew Morton
  2013-07-01 21:37     ` Jason Cooper
  1 sibling, 1 reply; 10+ messages in thread
From: Andrew Morton @ 2013-07-01 19:42 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, 1 Jul 2013 11:04:07 -0400 Jason Cooper <jason@lakedaemon.net> wrote:

> On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
> > Commit 834cbfe966bece50afded79da8e975d255bf0772
> >  ("drivers/dma: remove unused support for MEMSET operations")
> > removes MEMSET from dmaengine but does not completely removes it from
> > Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
> > This also fixes some compiler warnings about now obsolete functions by
> > removing those.
> > 
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > Cc: Jason Cooper <jason@lakedaemon.net>
> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Cc: Kyungmin Park <kyungmin.park@samsung.com>
> > Cc: Andrew Morton <akpm@linux-foundation.org>
> > Cc: linux-arm-kernel at lists.infradead.org
> > Cc: linux-kernel at vger.kernel.org
> > ---
> >  arch/arm/plat-orion/common.c |    6 ------
> >  drivers/dma/mv_xor.c         |   25 +------------------------
> >  2 files changed, 1 insertions(+), 30 deletions(-)
> 
> Please take a look at the email from lkml I just forwarded to you.  I
> believe this solves your problem, but I don't have time to look closely
> atm.

Unhelpful.  Can the rest of us see this email as well please?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 19:42   ` Andrew Morton
@ 2013-07-01 21:37     ` Jason Cooper
  2013-07-01 21:41       ` Andrew Morton
  0 siblings, 1 reply; 10+ messages in thread
From: Jason Cooper @ 2013-07-01 21:37 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jul 01, 2013 at 12:42:05PM -0700, Andrew Morton wrote:
> On Mon, 1 Jul 2013 11:04:07 -0400 Jason Cooper <jason@lakedaemon.net> wrote:
> 
> > On Mon, Jul 01, 2013 at 04:56:29PM +0200, Sebastian Hesselbarth wrote:
> > > Commit 834cbfe966bece50afded79da8e975d255bf0772
> > >  ("drivers/dma: remove unused support for MEMSET operations")
> > > removes MEMSET from dmaengine but does not completely removes it from
> > > Marvell Orion (arch/arm/plat-orion) and XOR (drivers/dma/mv_xor).
> > > This also fixes some compiler warnings about now obsolete functions by
> > > removing those.
> > > 
> > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > > ---
> > > Cc: Jason Cooper <jason@lakedaemon.net>
> > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > > Cc: Kyungmin Park <kyungmin.park@samsung.com>
> > > Cc: Andrew Morton <akpm@linux-foundation.org>
> > > Cc: linux-arm-kernel at lists.infradead.org
> > > Cc: linux-kernel at vger.kernel.org
> > > ---
> > >  arch/arm/plat-orion/common.c |    6 ------
> > >  drivers/dma/mv_xor.c         |   25 +------------------------
> > >  2 files changed, 1 insertions(+), 30 deletions(-)
> > 
> > Please take a look at the email from lkml I just forwarded to you.  I
> > believe this solves your problem, but I don't have time to look closely
> > atm.
> 
> Unhelpful.  Can the rest of us see this email as well please?

Sorry about that, the thread I was referring to on lkml was here:

http://comments.gmane.org/gmane.linux.kernel/1516018

And the specific email I was referring to is here (second version of
Bartlomiej's patch which addresses what Sebastian was attempting to fix):

http://permalink.gmane.org/gmane.linux.kernel/1517735

thx,

Jason.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 21:37     ` Jason Cooper
@ 2013-07-01 21:41       ` Andrew Morton
  2013-07-01 22:03         ` Sebastian Hesselbarth
  0 siblings, 1 reply; 10+ messages in thread
From: Andrew Morton @ 2013-07-01 21:41 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, 1 Jul 2013 17:37:06 -0400 Jason Cooper <jason@lakedaemon.net> wrote:

> > > Please take a look at the email from lkml I just forwarded to you.  I
> > > believe this solves your problem, but I don't have time to look closely
> > > atm.
> > 
> > Unhelpful.  Can the rest of us see this email as well please?
> 
> Sorry about that, the thread I was referring to on lkml was here:
> 
> http://comments.gmane.org/gmane.linux.kernel/1516018
> 
> And the specific email I was referring to is here (second version of
> Bartlomiej's patch which addresses what Sebastian was attempting to fix):
> 
> http://permalink.gmane.org/gmane.linux.kernel/1517735

Ah, OK, I have that:

http://ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations.patch
http://ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations-v3.patch

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal
  2013-07-01 21:41       ` Andrew Morton
@ 2013-07-01 22:03         ` Sebastian Hesselbarth
  0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Hesselbarth @ 2013-07-01 22:03 UTC (permalink / raw)
  To: linux-arm-kernel

On 07/01/2013 11:41 PM, Andrew Morton wrote:
> On Mon, 1 Jul 2013 17:37:06 -0400 Jason Cooper<jason@lakedaemon.net>  wrote:
>
>>>> Please take a look at the email from lkml I just forwarded to you.  I
>>>> believe this solves your problem, but I don't have time to look closely
>>>> atm.
>>>
>>> Unhelpful.  Can the rest of us see this email as well please?
>>
>> Sorry about that, the thread I was referring to on lkml was here:
>>
>> http://comments.gmane.org/gmane.linux.kernel/1516018
>>
>> And the specific email I was referring to is here (second version of
>> Bartlomiej's patch which addresses what Sebastian was attempting to fix):
>>
>> http://permalink.gmane.org/gmane.linux.kernel/1517735
>
> Ah, OK, I have that:
>
> http://ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations.patch

I guess, that is what is in next-20130701? My patch was based on it.

> http://ozlabs.org/~akpm/mmots/broken-out/drivers-dma-remove-unused-support-for-memset-operations-v3.patch

Bartlomeij sent another patch with all remaining differences between my
patch and the both above: https://lkml.org/lkml/2013/7/1/397

Sebastian

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2013-07-01 22:03 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-01 14:56 [PATCH] DMA: Fix Marvell Orion and mv_xor after MEMSET removal Sebastian Hesselbarth
2013-07-01 15:04 ` Jason Cooper
2013-07-01 15:14   ` Sebastian Hesselbarth
2013-07-01 15:17     ` Jason Cooper
2013-07-01 17:24       ` Bartlomiej Zolnierkiewicz
2013-07-01 17:29         ` Sebastian Hesselbarth
2013-07-01 19:42   ` Andrew Morton
2013-07-01 21:37     ` Jason Cooper
2013-07-01 21:41       ` Andrew Morton
2013-07-01 22:03         ` Sebastian Hesselbarth

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).