linux-next: build failure after merge of the slave-dma tree

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/dma/fsl-edma.c:67: warning: "EDMA_SEEI_SEEI" redefined
 #define EDMA_SEEI_SEEI(x) ((x) & 0x1F)

In file included from drivers/dma/fsl-edma.c:25:
drivers/dma/fsl-edma-common.h:21: note: this is the location of the previous definition
 #define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0))

 ...

drivers/dma/fsl-edma.c:115:6: error: nested redefinition of 'enum fsl_edma_pm_state'
 enum fsl_edma_pm_state {
      ^~~~~~~~~~~~~~~~~
drivers/dma/fsl-edma.c:115:6: error: redeclaration of 'enum fsl_edma_pm_state'
In file included from drivers/dma/fsl-edma.c:25:
drivers/dma/fsl-edma-common.h:63:6: note: originally defined here
 enum fsl_edma_pm_state {
      ^~~~~~~~~~~~~~~~~

and so on ...

Caused by commit

  101d256a45ed ("Merge branch 'testing/dirn_remove' into next")

which reintroduced a whole lot of stuff into drivers/dma/fsl-edma.c that
had been modev out in commit

  9d831528a656 ("dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended)")

I used the slave-dma tree from next-20181003 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod]

Hi Stephen,

On 04-10-18, 15:44, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/dma/fsl-edma.c:67: warning: "EDMA_SEEI_SEEI" redefined
>  #define EDMA_SEEI_SEEI(x) ((x) & 0x1F)
> 
> In file included from drivers/dma/fsl-edma.c:25:
> drivers/dma/fsl-edma-common.h:21: note: this is the location of the previous definition
>  #define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0))
> 
>  ...
> 
> drivers/dma/fsl-edma.c:115:6: error: nested redefinition of 'enum fsl_edma_pm_state'
>  enum fsl_edma_pm_state {
>       ^~~~~~~~~~~~~~~~~
> drivers/dma/fsl-edma.c:115:6: error: redeclaration of 'enum fsl_edma_pm_state'
> In file included from drivers/dma/fsl-edma.c:25:
> drivers/dma/fsl-edma-common.h:63:6: note: originally defined here
>  enum fsl_edma_pm_state {
>       ^~~~~~~~~~~~~~~~~
> 
> and so on ...
> 
> Caused by commit
> 
>   101d256a45ed ("Merge branch 'testing/dirn_remove' into next")
> 
> which reintroduced a whole lot of stuff into drivers/dma/fsl-edma.c that
> had been modev out in commit
> 
>   9d831528a656 ("dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended)")

I got a merge conflict but for include, so looks like merge went bad.
I will redo it and push

> I used the slave-dma tree from next-20181003 for today.

Thanks for updating

Best Regards,
-- 
~Vinod

RE: linux-next: build failure after merge of the slave-dma tree

[Robin Gong]

On 2019/7/8 12:17 Vinod Koul <vkoul@kernel.org> wrote:
> On 08-07-19, 11:06, zhangfei wrote:
> > Hi, Robin
> >
> > On 2019/7/8 上午9:22, Robin Gong wrote:
> > > Hi Stephen,
> > > 	That's caused by 'of_irq_count' NOT export to global symbol, and
> > > I'm curious why it has been here for so long since Zhangfei found it
> > > in 2015.
> > I remembered Rob suggested us not using of_irq_count and use
> > platform_get_irq etc.
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flkml
> > .org%2Flkml%2F2015%2F11%2F18%2F466&amp;data=02%7C01%7Cyibin.go
> ng%40nxp
> > .com%7Cb6d84a6976d7457dc34408d7035baaf5%7C686ea1d3bc2b4c6fa92
> cd99c5c30
> >
> 1635%7C0%7C0%7C636981564557143537&amp;sdata=jEgFnB3YNkVtsigfbN6
> XGJojlb
> > JAyOi8kiGd5JHJEcM%3D&amp;reserved=0
> 
> The explanation looks sane to me, so it makes sense to revert the commit for
> now. Reverted now
Ok, I will send v6 with the fix.

RE: linux-next: build failure after merge of the slave-dma tree

[Robin Gong]

On 2019/7/8 11:06 AM, zhangfei <zhangfei.gao@linaro.org> wrote:
> Hi, Robin
> 
> On 2019/7/8 上午9:22, Robin Gong wrote:
> > Hi Stephen,
> > 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm
> > curious why it has been here for so long since Zhangfei found it in
> > 2015.
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatc
> >
> hwork.kernel.org%2Fpatch%2F7404681%2F&amp;data=02%7C01%7Cyibin.gon
> g%40
> >
> nxp.com%7C5917e41babe84d562d4708d703514ed8%7C686ea1d3bc2b4c6fa
> 92cd99c5
> >
> c301635%7C0%7C0%7C636981520060417930&amp;sdata=QwPjifxeCEJmlrk0
> 2Ne71Bb
> > hSgsZNLLgx7PnO81MHmA%3D&amp;reserved=0
> > Hi Rob,
> > 	Is there something I miss so that Zhangfei's patch not accepted finally?
> >
> >
> 
> I remembered Rob suggested us not using of_irq_count and use
> platform_get_irq etc.
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flkml.org
> %2Flkml%2F2015%2F11%2F18%2F466&amp;data=02%7C01%7Cyibin.gong%4
> 0nxp.com%7C5917e41babe84d562d4708d703514ed8%7C686ea1d3bc2b4c6f
> a92cd99c5c301635%7C0%7C0%7C636981520060417930&amp;sdata=g2mNB
> 33%2Ba09JIpXot6j0w%2FV30grSVCt1GxZJCHyEgiM%3D&amp;reserved=0
> 
> So we remove of_irq_count
> commit 8c77dca011125b795bfa1c86f85a80132feee578
> Author: John Garry <john.garry@huawei.com>
> Date:   Thu Nov 19 20:23:59 2015 +0800
> 
>      hisi_sas: Remove dependency on of_irq_count
> 
> Thanks
Thank Fei for your kind information：）

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On 08-07-19, 11:06, zhangfei wrote:
> Hi, Robin
> 
> On 2019/7/8 上午9:22, Robin Gong wrote:
> > Hi Stephen,
> > 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm curious why it has been
> > here for so long since Zhangfei found it in 2015. https://patchwork.kernel.org/patch/7404681/
> > Hi Rob,
> > 	Is there something I miss so that Zhangfei's patch not accepted finally?
> > 
> > 
> 
> I remembered Rob suggested us not using of_irq_count and use
> platform_get_irq etc.
> https://lkml.org/lkml/2015/11/18/466

The explanation looks sane to me, so it makes sense to revert the commit
for now. Reverted now

-- >8 --

From 5c274ca4cfb22a455e880f61536b1894fa29fd17 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vkoul@kernel.org>
Date: Mon, 8 Jul 2019 09:42:55 +0530
Subject: [PATCH] dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2
 version support"

This reverts commit 7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp
edma2 version support") as this fails to build with module option due to
usage of of_irq_count() which is not an exported symbol as kernel
drivers are *not* expected to use it (rightly so).

Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/fsl-edma-common.c | 18 +---------
 drivers/dma/fsl-edma-common.h |  4 ---
 drivers/dma/fsl-edma.c        | 66 -----------------------------------
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index 6d6d8a4e8e38..44d92c34dec3 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -90,19 +90,6 @@ static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
 	iowrite8(val8, addr + off);
 }
 
-void mux_configure32(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
-		     u32 off, u32 slot, bool enable)
-{
-	u32 val;
-
-	if (enable)
-		val = EDMAMUX_CHCFG_ENBL << 24 | slot;
-	else
-		val = EDMAMUX_CHCFG_DIS;
-
-	iowrite32(val, addr + off * 4);
-}
-
 void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
 			unsigned int slot, bool enable)
 {
@@ -116,10 +103,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
 	muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
 	slot = EDMAMUX_CHCFG_SOURCE(slot);
 
-	if (fsl_chan->edma->drvdata->version == v3)
-		mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable);
-	else
-		mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
+	mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
 }
 EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
 
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 5eaa2902ed39..4e175560292c 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -125,7 +125,6 @@ struct fsl_edma_chan {
 	dma_addr_t			dma_dev_addr;
 	u32				dma_dev_size;
 	enum dma_data_direction		dma_dir;
-	char				chan_name[16];
 };
 
 struct fsl_edma_desc {
@@ -140,13 +139,11 @@ struct fsl_edma_desc {
 enum edma_version {
 	v1, /* 32ch, Vybrid, mpc57x, etc */
 	v2, /* 64ch Coldfire */
-	v3, /* 32ch, i.mx7ulp */
 };
 
 struct fsl_edma_drvdata {
 	enum edma_version	version;
 	u32			dmamuxs;
-	bool			has_dmaclk;
 	int			(*setup_irq)(struct platform_device *pdev,
 					     struct fsl_edma_engine *fsl_edma);
 };
@@ -156,7 +153,6 @@ struct fsl_edma_engine {
 	void __iomem		*membase;
 	void __iomem		*muxbase[DMAMUX_NR];
 	struct clk		*muxclk[DMAMUX_NR];
-	struct clk		*dmaclk;
 	struct mutex		fsl_edma_mutex;
 	const struct fsl_edma_drvdata *drvdata;
 	u32			n_chans;
diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index 50fe196b0c73..e616425acd5f 100644
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -166,50 +166,6 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma
 	return 0;
 }
 
-static int
-fsl_edma2_irq_init(struct platform_device *pdev,
-		   struct fsl_edma_engine *fsl_edma)
-{

-- 
~Vinod

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On 08-07-19, 02:01, Robin Gong wrote:
> On 06-07-19, 22:43, Vinod Koul <vkoul@kernel.org> wrote:
> > > 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm
> > > curious why it has been here for so long since Zhangfei found it in
> > > 2015.
> > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatc
> > >
> > hwork.kernel.org%2Fpatch%2F7404681%2F&amp;data=02%7C01%7Cyibin.gon
> > g%40
> > >
> > nxp.com%7C6172242dfadd4f71c09a08d70220bf6f%7C686ea1d3bc2b4c6fa92
> > cd99c5
> > >
> > c301635%7C0%7C0%7C636980211986259586&amp;sdata=L8v%2B1o5zfgIAS
> > go4qr3pu
> > > cQ%2Byox1irANsvRv5ZNLlLM%3D&amp;reserved=0
> > 
> > Yes this does not seem to be applied, perhaps Rob can explain why. But this was
> > not exported how did you test it?
> I had no such issue because I built in fsl-edma instead of Stephen's config with building module.

But you support it as a module, right? I am inclined to revert the patch
now!

-- 
~Vinod

Re: linux-next: build failure after merge of the slave-dma tree

[zhangfei]

Hi, Robin

On 2019/7/8 上午9:22, Robin Gong wrote:
> Hi Stephen,
> 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm curious why it has been
> here for so long since Zhangfei found it in 2015. https://patchwork.kernel.org/patch/7404681/
> Hi Rob,
> 	Is there something I miss so that Zhangfei's patch not accepted finally?
>
>

I remembered Rob suggested us not using of_irq_count and use 
platform_get_irq etc.
https://lkml.org/lkml/2015/11/18/466

So we remove of_irq_count
commit 8c77dca011125b795bfa1c86f85a80132feee578
Author: John Garry <john.garry@huawei.com>
Date:   Thu Nov 19 20:23:59 2015 +0800

     hisi_sas: Remove dependency on of_irq_count

Thanks

RE: linux-next: build failure after merge of the slave-dma tree

[Robin Gong]

On 06-07-19, 22:43, Vinod Koul <vkoul@kernel.org> wrote:
> > 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm
> > curious why it has been here for so long since Zhangfei found it in
> > 2015.
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatc
> >
> hwork.kernel.org%2Fpatch%2F7404681%2F&amp;data=02%7C01%7Cyibin.gon
> g%40
> >
> nxp.com%7C6172242dfadd4f71c09a08d70220bf6f%7C686ea1d3bc2b4c6fa92
> cd99c5
> >
> c301635%7C0%7C0%7C636980211986259586&amp;sdata=L8v%2B1o5zfgIAS
> go4qr3pu
> > cQ%2Byox1irANsvRv5ZNLlLM%3D&amp;reserved=0
> 
> Yes this does not seem to be applied, perhaps Rob can explain why. But this was
> not exported how did you test it?
I had no such issue because I built in fsl-edma instead of Stephen's config with building module.

RE: linux-next: build failure after merge of the slave-dma tree

[Robin Gong]

Hi Stephen,
	That's caused by 'of_irq_count' NOT export to global symbol, and I'm curious why it has been
here for so long since Zhangfei found it in 2015. https://patchwork.kernel.org/patch/7404681/
Hi Rob,
	Is there something I miss so that Zhangfei's patch not accepted finally?

On 04-07-19, 15:31 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "of_irq_count" [drivers/dma/fsl-edma.ko] undefined!
> 
> Caused by commit
> 
>   7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp edma2 version
> support")
> 
> I have reverted that commit for today.
> 
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On 06-07-19, 13:43, Robin Gong wrote:
> Hi Stephen,

Please **do not** top post!

> 	That's caused by 'of_irq_count' NOT export to global symbol, and I'm curious why it has been
> here for so long since Zhangfei found it in 2015. https://patchwork.kernel.org/patch/7404681/

Yes this does not seem to be applied, perhaps Rob can explain why. But
this was not exported how did you test it?

> Hi Rob,
> 	Is there something I miss so that Zhangfei's patch not accepted finally?

Rob, the commit in question is [1] and uses of_irq_count. Should it use
that if not what is the alternate?

> On 04-07-19, 15:31 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> > 
> > After merging the slave-dma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > ERROR: "of_irq_count" [drivers/dma/fsl-edma.ko] undefined!
> > 
> > Caused by commit
> > 
> >   7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp edma2 version
> > support")
> > 
> > I have reverted that commit for today.
> > 
> > --
> > Cheers,
> > Stephen Rothwell

[1]: http://git.infradead.org/users/vkoul/slave-dma.git/commitdiff/7144afd025b23b042c158582160d7d2b10a754b7?hp=a7c5c6f6bc295d6c158db4ef9d1ca6770032669d

-- 
~Vinod

RE: linux-next: build failure after merge of the slave-dma tree

[Robin Gong]

Hi Stephen,
	That's caused by 'of_irq_count' NOT export to global symbol, and I'm curious why it has been
here for so long since Zhangfei found it in 2015. https://patchwork.kernel.org/patch/7404681/
Hi Rob,
	Is there something I miss so that Zhangfei's patch not accepted finally?

On 04-07-19, 15:31 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "of_irq_count" [drivers/dma/fsl-edma.ko] undefined!
> 
> Caused by commit
> 
>   7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp edma2 version
> support")
> 
> I have reverted that commit for today.
> 
> --
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

Hi all,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "of_irq_count" [drivers/dma/fsl-edma.ko] undefined!

Caused by commit

  7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp edma2 version support")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Tue, Aug 22, 2017 at 03:36:54PM +1000, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/dma/dmaengine.h:9:0,
>                  from drivers/dma/altera-msgdma.c:27:
> drivers/dma/altera-msgdma.c: In function 'msgdma_probe':
> drivers/dma/altera-msgdma.c:946:14: error: 'DMA_SG' undeclared (first use in this function)
>   dma_cap_set(DMA_SG, dma_dev->cap_mask);
>               ^
> include/linux/dmaengine.h:1197:46: note: in definition of macro 'dma_cap_set'
>  #define dma_cap_set(tx, mask) __dma_cap_set((tx), &(mask))
>                                               ^
> drivers/dma/altera-msgdma.c:946:14: note: each undeclared identifier is reported only once for each function it appears in
>   dma_cap_set(DMA_SG, dma_dev->cap_mask);
>               ^
> include/linux/dmaengine.h:1197:46: note: in definition of macro 'dma_cap_set'
>  #define dma_cap_set(tx, mask) __dma_cap_set((tx), &(mask))
>                                               ^
> drivers/dma/altera-msgdma.c:965:9: error: 'struct dma_device' has no member named 'device_prep_dma_sg'
>   dma_dev->device_prep_dma_sg = msgdma_prep_sg;
>          ^
> 
> Caused by commit
> 
>   a85c6f1b2921 ("dmaengine: Add driver for Altera / Intel mSGDMA IP core")
> 
> interacting with commit
> 
>   c678fa66341c ("dmaengine: remove DMA_SG as it is dead code in kernel")
> 
> This should have been fixed up in the merge commit
> 
>   0a0ab6497093 ("Merge branch 'topic/dmatest' into next")
> 
> I have used the slave-dma tree from next-20170817 for today.

Thanks Stephen for reporting, I have fixed it up by removed DMA_SG from this
driver with belo patch

-- >8 --

From: Vinod Koul <vinod.koul@intel.com>
Date: Tue, 22 Aug 2017 22:03:43 +0530
Subject: [PATCH] dmaengine: altera: remove DMA_SG

Commit c678fa66341c: ("dmaengine: remove DMA_SG as it is dead code in
kernel") removes DMA_SG from dmaengine subsystem but missed the newly added
driver, so remove it from here as well

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/dma/altera-msgdma.c | 94 ---------------------------------------------
 1 file changed, 94 deletions(-)

diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c
index 33b87b413793..75208b43d137 100644
--- a/drivers/dma/altera-msgdma.c
+++ b/drivers/dma/altera-msgdma.c
@@ -386,98 +386,6 @@ msgdma_prep_memcpy(struct dma_chan *dchan, dma_addr_t dma_dst,
 }
 
 /**
- * msgdma_prep_sg - prepare descriptors for a memory sg transaction
- * @dchan: DMA channel
- * @dst_sg: Destination scatter list
- * @dst_sg_len: Number of entries in destination scatter list
- * @src_sg: Source scatter list
- * @src_sg_len: Number of entries in source scatter list
- * @flags: transfer ack flags
- *
- * Return: Async transaction descriptor on success and NULL on failure
- */
-static struct dma_async_tx_descriptor *
-msgdma_prep_sg(struct dma_chan *dchan, struct scatterlist *dst_sg,
-	       unsigned int dst_sg_len, struct scatterlist *src_sg,
-	       unsigned int src_sg_len, unsigned long flags)
-{
-	struct msgdma_device *mdev = to_mdev(dchan);
-	struct msgdma_sw_desc *new, *first = NULL;
-	void *desc = NULL;
-	size_t len, dst_avail, src_avail;
-	dma_addr_t dma_dst, dma_src;
-	u32 desc_cnt = 0, i;
-	struct scatterlist *sg;
-
-	for_each_sg(src_sg, sg, src_sg_len, i)
-		desc_cnt += DIV_ROUND_UP(sg_dma_len(sg), MSGDMA_MAX_TRANS_LEN);
-
-	spin_lock_bh(&mdev->lock);
-	if (desc_cnt > mdev->desc_free_cnt) {
-		spin_unlock_bh(&mdev->lock);
-		dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev);
-		return NULL;
-	}
-	mdev->desc_free_cnt -= desc_cnt;
-	spin_unlock_bh(&mdev->lock);
-
-	dst_avail = sg_dma_len(dst_sg);
-	src_avail = sg_dma_len(src_sg);
-
-	/* Run until we are out of scatterlist entries */
-	while (true) {
-		/* Allocate and populate the descriptor */
-		new = msgdma_get_descriptor(mdev);
-
-		desc = &new->hw_desc;
-		len = min_t(size_t, src_avail, dst_avail);
-		len = min_t(size_t, len, MSGDMA_MAX_TRANS_LEN);
-		if (len == 0)
-			goto fetch;
-		dma_dst = sg_dma_address(dst_sg) + sg_dma_len(dst_sg) -
-			dst_avail;
-		dma_src = sg_dma_address(src_sg) + sg_dma_len(src_sg) -
-			src_avail;
-
-		msgdma_desc_config(desc, dma_dst, dma_src, len,
-				   MSGDMA_DESC_STRIDE_RW);
-		dst_avail -= len;
-		src_avail -= len;
-
-		if (!first)
-			first = new;
-		else
-			list_add_tail(&new->node, &first->tx_list);
-fetch:
-		/* Fetch the next dst scatterlist entry */
-		if (dst_avail == 0) {
-			if (dst_sg_len == 0)
-				break;
-			dst_sg = sg_next(dst_sg);
-			if (dst_sg == NULL)
-				break;
-			dst_sg_len--;
-			dst_avail = sg_dma_len(dst_sg);
-		}
-		/* Fetch the next src scatterlist entry */
-		if (src_avail == 0) {
-			if (src_sg_len == 0)
-				break;
-			src_sg = sg_next(src_sg);
-			if (src_sg == NULL)
-				break;
-			src_sg_len--;
-			src_avail = sg_dma_len(src_sg);
-		}
-	}
-
-	msgdma_desc_config_eod(desc);
-	first->async_tx.flags = flags;
-
-	return &first->async_tx;
-}
-
-/**
  * msgdma_prep_slave_sg - prepare descriptors for a slave sg transaction
  *
  * @dchan: DMA channel
@@ -943,7 +851,6 @@ static int msgdma_probe(struct platform_device *pdev)
 	/* Set DMA capabilities */
 	dma_cap_zero(dma_dev->cap_mask);
 	dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask);
-	dma_cap_set(DMA_SG, dma_dev->cap_mask);
 	dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);
 
 	dma_dev->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
@@ -962,7 +869,6 @@ static int msgdma_probe(struct platform_device *pdev)
 
 	dma_dev->copy_align = DMAENGINE_ALIGN_4_BYTES;
 	dma_dev->device_prep_dma_memcpy = msgdma_prep_memcpy;
-	dma_dev->device_prep_dma_sg = msgdma_prep_sg;
 	dma_dev->device_prep_slave_sg = msgdma_prep_slave_sg;
 	dma_dev->device_config = msgdma_dma_config;
 
-- 
2.7.4

-- 
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/dma/dmaengine.h:9:0,
                 from drivers/dma/altera-msgdma.c:27:
drivers/dma/altera-msgdma.c: In function 'msgdma_probe':
drivers/dma/altera-msgdma.c:946:14: error: 'DMA_SG' undeclared (first use in this function)
  dma_cap_set(DMA_SG, dma_dev->cap_mask);
              ^
include/linux/dmaengine.h:1197:46: note: in definition of macro 'dma_cap_set'
 #define dma_cap_set(tx, mask) __dma_cap_set((tx), &(mask))
                                              ^
drivers/dma/altera-msgdma.c:946:14: note: each undeclared identifier is reported only once for each function it appears in
  dma_cap_set(DMA_SG, dma_dev->cap_mask);
              ^
include/linux/dmaengine.h:1197:46: note: in definition of macro 'dma_cap_set'
 #define dma_cap_set(tx, mask) __dma_cap_set((tx), &(mask))
                                              ^
drivers/dma/altera-msgdma.c:965:9: error: 'struct dma_device' has no member named 'device_prep_dma_sg'
  dma_dev->device_prep_dma_sg = msgdma_prep_sg;
         ^

Caused by commit

  a85c6f1b2921 ("dmaengine: Add driver for Altera / Intel mSGDMA IP core")

interacting with commit

  c678fa66341c ("dmaengine: remove DMA_SG as it is dead code in kernel")

This should have been fixed up in the merge commit

  0a0ab6497093 ("Merge branch 'topic/dmatest' into next")

I have used the slave-dma tree from next-20170817 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Fri, Sep 16, 2016 at 09:34:44AM +0100, Peter Griffin wrote:
> Hi Vinod & Stephen,
> 
> On Fri, 16 Sep 2016, Stephen Rothwell wrote:
> 
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (arm
> > multi_v7_defconfig build) failed like this:
> 
> FYI Patch 17 of 19 in the fdma series "drm/virtio: kconfig: Fix recursive dependency
> issue." [1], fixes this issue. It looks like that hasn't been applied. I should have
> made it clearer that this was a depedency (and the other white drm/kconfig white
> space fixup obviously isn't).

Yeah it should have been mentioned.

And I do not like to merge DRM patches for this and that too without ACKs.

I am dropping this branch from next untill I get ACK from someone on DRM
side to apply this

Thanks
-- 
~Vinod

Re: linux-next: build failure after merge of the slave-dma tree

[Peter Griffin]

Hi Vinod & Stephen,

On Fri, 16 Sep 2016, Stephen Rothwell wrote:

> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (arm
> multi_v7_defconfig build) failed like this:

FYI Patch 17 of 19 in the fdma series "drm/virtio: kconfig: Fix recursive dependency
issue." [1], fixes this issue. It looks like that hasn't been applied. I should have
made it clearer that this was a depedency (and the other white drm/kconfig white
space fixup obviously isn't).

https://lkml.org/lkml/2016/9/5/328

regards,

Peter.

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (arm
multi_v7_defconfig build) failed like this:

drivers/video/fbdev/Kconfig:5:error: recursive dependency detected!
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/video/fbdev/Kconfig:5:  symbol FB is selected by DRM_KMS_FB_HELPER
drivers/gpu/drm/Kconfig:42:     symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:36:     symbol DRM_KMS_HELPER is selected by DRM_VIRTIO_GPU
drivers/gpu/drm/virtio/Kconfig:1:       symbol DRM_VIRTIO_GPU depends on VIRTIO
drivers/virtio/Kconfig:1:       symbol VIRTIO is selected by REMOTEPROC
drivers/remoteproc/Kconfig:4:   symbol REMOTEPROC is selected by ST_SLIM_REMOTEPROC
drivers/remoteproc/Kconfig:103: symbol ST_SLIM_REMOTEPROC is selected by ST_FDMA
drivers/dma/Kconfig:440:        symbol ST_FDMA depends on DMADEVICES
drivers/dma/Kconfig:5:  symbol DMADEVICES is selected by SND_SOC_SH4_SIU
sound/soc/sh/Kconfig:29:        symbol SND_SOC_SH4_SIU is selected by SND_SIU_MIGOR
sound/soc/sh/Kconfig:58:        symbol SND_SIU_MIGOR depends on I2C
drivers/i2c/Kconfig:7:  symbol I2C is selected by FB_DDC
drivers/video/fbdev/Kconfig:63: symbol FB_DDC is selected by FB_CYBER2000_DDC
drivers/video/fbdev/Kconfig:382:        symbol FB_CYBER2000_DDC depends on FB_CYBER2000
drivers/video/fbdev/Kconfig:370:        symbol FB_CYBER2000 depends on FB
*
* Restart config...
*
*
* USB HID Boot Protocol drivers
*
USB HIDBP Keyboard (simple Boot) support (USB_KBD) [N/m/y/?] (NEW) aborted!

Console input/output is redirected. Run 'make oldconfig' to update configuration.

/home/sfr/next/next/scripts/kconfig/Makefile:37: recipe for target 'silentoldconfig' failed

Probably caused by commits

  73f19dcade3d ("remoteproc: st_slim_rproc: add a slimcore rproc driver")
  e0cbdfc766bf ("dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support")
  a490790f8df3 ("ARM: multi_v7_defconfig: Enable STi and simple-card drivers.")

I have used the slave-dma tree from next-20160915 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Arnd,

On Thu, 15 Oct 2015 16:07:51 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> I've added a workaround to the asm-generic tree, no need to worry about
> it for now. We can change over the remaining users of
> asm-generic/io-64-nonatomic-lo-hi.h for the following merge window and
> then remove the wrapper.

Thanks.  I have dropped my merge fix patches as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the slave-dma tree

[Arnd Bergmann]

On Thursday 15 October 2015 14:51:42 Stephen Rothwell wrote:
> Hi Vinod,
> 
> On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" <vinod.koul@intel.com> wrote:
> >
> > So should I ask Linus to apply this fix once merge window opens or you will send
> > this, how do we go about fixing this one 
> > 
> > Or should I merge the above commit from asm-generic tree?
> 
> Up to you.  Though you should only merge fro mthe asm-generic tree if
> the maintainer guarantees it will not be rebased.
> 
> You could just wait and tell Linus that this fixup is needed when the
> two trees are merged.  It really need to go into the merge commit to
> avoid bisection problems.
> 

I've added a workaround to the asm-generic tree, no need to worry about
it for now. We can change over the remaining users of
asm-generic/io-64-nonatomic-lo-hi.h for the following merge window and
then remove the wrapper.

	Arnd

Re: linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Vinod,

On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" <vinod.koul@intel.com> wrote:
>
> So should I ask Linus to apply this fix once merge window opens or you will send
> this, how do we go about fixing this one :)
> 
> Or should I merge the above commit from asm-generic tree?

Up to you.  Though you should only merge fro mthe asm-generic tree if
the maintainer guarantees it will not be rebased.

You could just wait and tell Linus that this fixup is needed when the
two trees are merged.  It really need to go into the merge commit to
avoid bisection problems.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the slave-dma tree

[Koul, Vinod]

On Thu, 2015-10-15 at 11:51 +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/dma/idma64.h:19:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No
> such file or directory
>  #include <asm-generic/io-64-nonatomic-lo-hi.h>
>                                                ^
> 
> Caused by commit
> 
>   97c37accd38f ("dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()")
> 
> interacting with commit
> 
>   f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")
> 
> from the asm-generic tree.
> 
> I have applied the folling merge fix patch and can carry it as necessary.

Thanks Stephen, This looks fine to me.

So should I ask Linus to apply this fix once merge window opens or you will send
this, how do we go about fixing this one :)

Or should I merge the above commit from asm-generic tree?

-- 
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/idma64.h:19:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
                                               ^

Caused by commit

  97c37accd38f ("dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()")

interacting with commit

  f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")

from the asm-generic tree.

I have applied the folling merge fix patch and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Oct 2015 11:47:07 +1100
Subject: [PATCH] dmaengine: idma64: merge fix for "move io-64-nonatomic*.h out of asm-generic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/dma/idma64.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h
index f6aeff0af8a5..801d5462d663 100644
--- a/drivers/dma/idma64.h
+++ b/drivers/dma/idma64.h
@@ -15,8 +15,7 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
-
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #include "virt-dma.h"
 
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the slave-dma tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

On Mon, Aug 24, 2015 at 01:41:43PM +0530, Vinod Koul wrote:
> On Mon, Aug 24, 2015 at 08:53:59AM +0200, Maxime Ripard wrote:
> > > I am dropping this commit now, it need to be fixed to take into account
> > > Cyrille work on remove tx_width and this patch should be updated to reflect
> > > that
> > 
> > I'll send an updated version today, is there some time left for this
> > to be part of 4.3?
> 
> Fortunately for you, Linus released rc8, so yes if you are quick we can still
> merge this

I just fixed the issue, tested it, and sent a new version.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

On Mon, Aug 24, 2015 at 08:53:59AM +0200, Maxime Ripard wrote:
> > I am dropping this commit now, it need to be fixed to take into account
> > Cyrille work on remove tx_width and this patch should be updated to reflect
> > that
> 
> I'll send an updated version today, is there some time left for this
> to be part of 4.3?

Fortunately for you, Linus released rc8, so yes if you are quick we can still
merge this

-- 
~Vinod


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

Hi Vinod,

On Thu, Aug 06, 2015 at 08:30:27AM +0530, Vinod Koul wrote:
> On Thu, Aug 06, 2015 at 12:22:03PM +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/dma/at_hdmac.c: In function 'atc_prep_dma_memset':
> > drivers/dma/at_hdmac.c:960:6: error: 'struct at_desc' has no member named 'tx_width'
> >   desc->tx_width = 2;
> >       ^
> > 
> > Caused by commit
> > 
> >   25fed8c2fff1 ("dmaengine: hdmac: Add memset capabilities")
> > 
> > interacting with commit
> > 
> >   93dce3a6434f ("dmaengine: at_hdmac: fix residue computation")
> Thanks Stephen,
> 
> I am dropping this commit now, it need to be fixed to take into account
> Cyrille work on remove tx_width and this patch should be updated to reflect
> that

I'll send an updated version today, is there some time left for this
to be part of 4.3?

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Thu, Aug 06, 2015 at 12:22:03PM +1000, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/dma/at_hdmac.c: In function 'atc_prep_dma_memset':
> drivers/dma/at_hdmac.c:960:6: error: 'struct at_desc' has no member named 'tx_width'
>   desc->tx_width = 2;
>       ^
> 
> Caused by commit
> 
>   25fed8c2fff1 ("dmaengine: hdmac: Add memset capabilities")
> 
> interacting with commit
> 
>   93dce3a6434f ("dmaengine: at_hdmac: fix residue computation")
Thanks Stephen,

I am dropping this commit now, it need to be fixed to take into account
Cyrille work on remove tx_width and this patch should be updated to reflect
that

-- 
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/dma/at_hdmac.c: In function 'atc_prep_dma_memset':
drivers/dma/at_hdmac.c:960:6: error: 'struct at_desc' has no member named 'tx_width'
  desc->tx_width = 2;
      ^

Caused by commit

  25fed8c2fff1 ("dmaengine: hdmac: Add memset capabilities")

interacting with commit

  93dce3a6434f ("dmaengine: at_hdmac: fix residue computation")

>From Linus' tree (v4.2-rc5).  This should have been fixed up in commit

  fa362949e874 ("Merge branch 'for-linus' into next")

I have used the slave-dma tree from next-20150805 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Mon, Feb 16, 2015 at 01:48:56AM +0000, Yibin Gong wrote:
> Hi Stephen,
>     Thanks for you report. I have notice it and sent the v4 patch review yesterday.
> 
> 发自我的 iPhone
> 
> > 在 2015年2月16日，09:09，Stephen Rothwell <sfr@canb.auug.org.au> 写道：
> > 
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (arm multi_v7_defconfig)
> > failed like this:
> > 
> > drivers/dma/imx-sdma.c: In function 'sdma_run_channel0':
> > drivers/dma/imx-sdma.c:535:57: error: macro "readl" passed 2 arguments, but takes just 1
> >  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
> >                                                         ^
> > drivers/dma/imx-sdma.c:535:6: error: 'readl' undeclared (first use in this function)
> >  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
> >      ^
Thanks Stephen,

> > 
> > Caused by commit 66a073b6478d ("dmaengine: imx-sdma: switch to dynamic
> > context mode after script loaded").
I have dropped the offending commit now

-- 
~Vinod

> > 
> > I have used the slave-dma tree from next-20150213 for today.
> > -- 
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au

-- 

Re: linux-next: build failure after merge of the slave-dma tree

[Yibin Gong]

Hi Stephen,
    Thanks for you report. I have notice it and sent the v4 patch review yesterday.

发自我的 iPhone

> 在 2015年2月16日，09:09，Stephen Rothwell <sfr@canb.auug.org.au> 写道：
> 
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (arm multi_v7_defconfig)
> failed like this:
> 
> drivers/dma/imx-sdma.c: In function 'sdma_run_channel0':
> drivers/dma/imx-sdma.c:535:57: error: macro "readl" passed 2 arguments, but takes just 1
>  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
>                                                         ^
> drivers/dma/imx-sdma.c:535:6: error: 'readl' undeclared (first use in this function)
>  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
>      ^
> 
> Caused by commit 66a073b6478d ("dmaengine: imx-sdma: switch to dynamic
> context mode after script loaded").
> 
> I have used the slave-dma tree from next-20150213 for today.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 801 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (arm multi_v7_defconfig)
failed like this:

drivers/dma/imx-sdma.c: In function 'sdma_run_channel0':
drivers/dma/imx-sdma.c:535:57: error: macro "readl" passed 2 arguments, but takes just 1
  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
                                                         ^
drivers/dma/imx-sdma.c:535:6: error: 'readl' undeclared (first use in this function)
  if (readl(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG) == 0)
      ^

Caused by commit 66a073b6478d ("dmaengine: imx-sdma: switch to dynamic
context mode after script loaded").

I have used the slave-dma tree from next-20150213 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 2366 bytes --]

On Tue, Dec 09, 2014 at 02:48:17PM +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
I did merge the next-20141208 wth this new code and pushed. Found and
resolved the same merg conflict as you :) Feng'd bot didn't
find any issues, so am wondering why :)

Neverthless, I am dropping these changes from next.

Thanks for reporting them

> drivers/spi/spi-atmel.c: In function 'atmel_spi_stop_dma':
> drivers/spi/spi-atmel.c:485:26: error: 'struct dma_device' has no member named 'device_control'
>    as->dma.chan_rx->device->device_control(as->dma.chan_rx,
>                           ^
> drivers/spi/spi-atmel.c:486:8: error: 'DMA_TERMINATE_ALL' undeclared (first use in this function)
>         DMA_TERMINATE_ALL, 0);
>         ^
> drivers/spi/spi-atmel.c:486:8: note: each undeclared identifier is reported only once for each function it appears in
> drivers/spi/spi-atmel.c:488:26: error: 'struct dma_device' has no member named 'device_control'
>    as->dma.chan_tx->device->device_control(as->dma.chan_tx,
>                           ^
> drivers/usb/musb/ux500_dma.c: In function 'ux500_configure_channel':
> drivers/usb/musb/ux500_dma.c:124:18: error: 'struct dma_device' has no member named 'device_control'
>   dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
>                   ^
> drivers/usb/musb/ux500_dma.c:124:45: error: 'DMA_SLAVE_CONFIG' undeclared (first use in this function)
>   dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
>                                              ^
> drivers/usb/musb/ux500_dma.c:124:45: note: each undeclared identifier is reported only once for each function it appears in
> drivers/usb/musb/ux500_dma.c: In function 'ux500_dma_channel_abort':
> drivers/usb/musb/ux500_dma.c:249:34: error: 'struct dma_device' has no member named 'device_control'
>    ux500_channel->dma_chan->device->
>                                   ^
> drivers/usb/musb/ux500_dma.c:251:6: error: 'DMA_TERMINATE_ALL' undeclared (first use in this function)
>       DMA_TERMINATE_ALL, 0);
>       ^
> 
> Caused by commit f86999789afe ("dmaengine: Remove device_control and
> device_slave_caps").
> 
> I have used the slave-dma tree from next-20141208 for today.

-- 
~Vinod

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2029 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/spi/spi-atmel.c: In function 'atmel_spi_stop_dma':
drivers/spi/spi-atmel.c:485:26: error: 'struct dma_device' has no member named 'device_control'
   as->dma.chan_rx->device->device_control(as->dma.chan_rx,
                          ^
drivers/spi/spi-atmel.c:486:8: error: 'DMA_TERMINATE_ALL' undeclared (first use in this function)
        DMA_TERMINATE_ALL, 0);
        ^
drivers/spi/spi-atmel.c:486:8: note: each undeclared identifier is reported only once for each function it appears in
drivers/spi/spi-atmel.c:488:26: error: 'struct dma_device' has no member named 'device_control'
   as->dma.chan_tx->device->device_control(as->dma.chan_tx,
                          ^
drivers/usb/musb/ux500_dma.c: In function 'ux500_configure_channel':
drivers/usb/musb/ux500_dma.c:124:18: error: 'struct dma_device' has no member named 'device_control'
  dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
                  ^
drivers/usb/musb/ux500_dma.c:124:45: error: 'DMA_SLAVE_CONFIG' undeclared (first use in this function)
  dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
                                             ^
drivers/usb/musb/ux500_dma.c:124:45: note: each undeclared identifier is reported only once for each function it appears in
drivers/usb/musb/ux500_dma.c: In function 'ux500_dma_channel_abort':
drivers/usb/musb/ux500_dma.c:249:34: error: 'struct dma_device' has no member named 'device_control'
   ux500_channel->dma_chan->device->
                                  ^
drivers/usb/musb/ux500_dma.c:251:6: error: 'DMA_TERMINATE_ALL' undeclared (first use in this function)
      DMA_TERMINATE_ALL, 0);
      ^

Caused by commit f86999789afe ("dmaengine: Remove device_control and
device_slave_caps").

I have used the slave-dma tree from next-20141208 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Ludovic Desroches]

Hi Vinod,

On Mon, Nov 10, 2014 at 10:36:16AM +0530, Vinod Koul wrote:
> On Mon, Nov 10, 2014 at 11:58:46AM +1100, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/dma/at_xdmac.c: In function 'at_xdmac_off':
> > drivers/dma/at_xdmac.c:317:2: error: implicit declaration of function 'writel_relaxed' [-Werror=implicit-function-declaration]
> >   at_xdmac_write(atxdmac, AT_XDMAC_GD, -1L);
> >   ^
> > 
> > Caused by commit e1f7c9eee707 ("dmaengine: at_xdmac: creation of the
> > atmel eXtended DMA Controller driver").
> Thanks Stephen,
> 
> I have fixed this error and warning, the tree is updated now

Thanks to manage it, sorry I didn't have the time to send a fix for
it. I will send you a patch to reintroduce _relaxed version of readl and
writel but I will remove COMPILE_TEST since _relaxed is not implemented
on other architectures.

Regards

Ludovic

> 
> -- 
> ~Vinod
> 
> > 
> > Also, lots of warnings like:
> > 
> > drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_slave_sg':
> > include/linux/dynamic_debug.h:64:16: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
> >   static struct _ddebug  __aligned(8)   \
> >                 ^
> > include/linux/dynamic_debug.h:84:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
> >   DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);  \
> >   ^
> > include/linux/device.h:1107:2: note: in expansion of macro 'dynamic_dev_dbg'
> >   dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
> >   ^
> > drivers/dma/at_xdmac.c:621:3: note: in expansion of macro 'dev_dbg'
> >    dev_dbg(chan2dev(chan),
> >    ^
> > 
> > I have used the slave-dma tree from next-20141106 for today.
> > -- 
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> 
> 
> 
> -- 

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]

On Mon, Nov 10, 2014 at 11:58:46AM +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/dma/at_xdmac.c: In function 'at_xdmac_off':
> drivers/dma/at_xdmac.c:317:2: error: implicit declaration of function 'writel_relaxed' [-Werror=implicit-function-declaration]
>   at_xdmac_write(atxdmac, AT_XDMAC_GD, -1L);
>   ^
> 
> Caused by commit e1f7c9eee707 ("dmaengine: at_xdmac: creation of the
> atmel eXtended DMA Controller driver").
Thanks Stephen,

I have fixed this error and warning, the tree is updated now

-- 
~Vinod

> 
> Also, lots of warnings like:
> 
> drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_slave_sg':
> include/linux/dynamic_debug.h:64:16: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
>   static struct _ddebug  __aligned(8)   \
>                 ^
> include/linux/dynamic_debug.h:84:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
>   DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);  \
>   ^
> include/linux/device.h:1107:2: note: in expansion of macro 'dynamic_dev_dbg'
>   dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
>   ^
> drivers/dma/at_xdmac.c:621:3: note: in expansion of macro 'dev_dbg'
>    dev_dbg(chan2dev(chan),
>    ^
> 
> I have used the slave-dma tree from next-20141106 for today.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



-- 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/dma/at_xdmac.c: In function 'at_xdmac_off':
drivers/dma/at_xdmac.c:317:2: error: implicit declaration of function 'writel_relaxed' [-Werror=implicit-function-declaration]
  at_xdmac_write(atxdmac, AT_XDMAC_GD, -1L);
  ^

Caused by commit e1f7c9eee707 ("dmaengine: at_xdmac: creation of the
atmel eXtended DMA Controller driver").

Also, lots of warnings like:

drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_slave_sg':
include/linux/dynamic_debug.h:64:16: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
  static struct _ddebug  __aligned(8)   \
                ^
include/linux/dynamic_debug.h:84:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
  DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);  \
  ^
include/linux/device.h:1107:2: note: in expansion of macro 'dynamic_dev_dbg'
  dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
  ^
drivers/dma/at_xdmac.c:621:3: note: in expansion of macro 'dev_dbg'
   dev_dbg(chan2dev(chan),
   ^

I have used the slave-dma tree from next-20141106 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Geert Uytterhoeven]

On Fri, Sep 12, 2014 at 5:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the slave-dma tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
>
> drivers/spi/spi-pxa2xx-pci.c:70:3: error: unknown field 'max_clk_rate' specified in initializer
>    .max_clk_rate = 50000000,
>    ^
>
> Caused by commit bfe607a528ba ("spi/pxa2xx-pci: Add support for Intel
> Braswell").
>
> I have used the slave-dma tree from next-20140911 for today.

It depends on commit afa93c9017fd48d4d5265854c75f5fcde0871548
("spi/pxa2xx-pci: Add common clock framework support in PCI glue layer")
from spi/for-next.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:


drivers/spi/spi-pxa2xx-pci.c:70:3: error: unknown field 'max_clk_rate' specified in initializer
   .max_clk_rate = 50000000,
   ^

Caused by commit bfe607a528ba ("spi/pxa2xx-pci: Add support for Intel
Braswell").

I have used the slave-dma tree from next-20140911 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1949 bytes --]

Hi,

On Mon, Jul 28, 2014 at 12:46:22PM +0530, Vinod Koul wrote:
> On Mon, Jul 28, 2014 at 12:18:56PM +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/dma/sun6i-dma.c: In function 'sun6i_dma_dump_chan_regs':
> > drivers/dma/sun6i-dma.c:203:2: error: implicit declaration of function '__virt_to_phys' [-Werror=implicit-function-declaration]
> >   phys_addr_t reg = __virt_to_phys((unsigned long)pchan->base);
> >   ^
> > 
> > Caused by commit 555859308723 ("dmaengine: sun6i: Add driver for the
> > Allwinner A31 DMA controller").  Presumably missing an include file.
> > 
> > I have used the slave-dma tree from next-20140725 for today.
> 
> Thanks, Feng's robot also gave such warning. SInce maxime didnt send any
> fixes it, I am applying below to fix this.
> We shouldnt have used __virt_to_phys here

Thanks for taking care of this.

> 
> --x8---
> From: Vinod Koul <vinod.koul@intel.com>
> Date: Mon, 28 Jul 2014 11:57:25 +0530
> Subject: [PATCH 1/2] dmaengine: sun6i: fix build failure on x86, xilinx targets
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> Since the driver defined COMPILE_TEST, it gets compiled for different arch's.
> The driver uses __virt_to_phys() insteadof virt_to_phys, so replace it
> 
> drivers/dma/sun6i-dma.c: In function ‘sun6i_dma_dump_chan_regs’:
> drivers/dma/sun6i-dma.c:203: error: implicit declaration of function '__virt_to_phys'
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]

On Mon, Jul 28, 2014 at 12:18:56PM +1000, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/dma/sun6i-dma.c: In function 'sun6i_dma_dump_chan_regs':
> drivers/dma/sun6i-dma.c:203:2: error: implicit declaration of function '__virt_to_phys' [-Werror=implicit-function-declaration]
>   phys_addr_t reg = __virt_to_phys((unsigned long)pchan->base);
>   ^
> 
> Caused by commit 555859308723 ("dmaengine: sun6i: Add driver for the
> Allwinner A31 DMA controller").  Presumably missing an include file.
> 
> I have used the slave-dma tree from next-20140725 for today.

Thanks, Feng's robot also gave such warning. SInce maxime didnt send any
fixes it, I am applying below to fix this.
We shouldnt have used __virt_to_phys here

--x8---
From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 28 Jul 2014 11:57:25 +0530
Subject: [PATCH 1/2] dmaengine: sun6i: fix build failure on x86, xilinx targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the driver defined COMPILE_TEST, it gets compiled for different arch's.
The driver uses __virt_to_phys() insteadof virt_to_phys, so replace it

drivers/dma/sun6i-dma.c: In function ‘sun6i_dma_dump_chan_regs’:
drivers/dma/sun6i-dma.c:203: error: implicit declaration of function '__virt_to_phys'

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/dma/sun6i-dma.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
index ce8d5d1..e9f99bb 100644
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@ -200,7 +200,7 @@ static inline void sun6i_dma_dump_com_regs(struct sun6i_dma_dev *sdev)
 static inline void sun6i_dma_dump_chan_regs(struct sun6i_dma_dev *sdev,
 					    struct sun6i_pchan *pchan)
 {
-	phys_addr_t reg = __virt_to_phys((unsigned long)pchan->base);
+	phys_addr_t reg = virt_to_phys(pchan->base);
 
 	dev_dbg(sdev->slave.dev, "Chan %d reg: %pa\n"
 		"\t___en(%04x): \t0x%08x\n"
@@ -330,7 +330,7 @@ static inline int sun6i_dma_cfg_lli(struct sun6i_dma_lli *lli,
 static inline void sun6i_dma_dump_lli(struct sun6i_vchan *vchan,
 				      struct sun6i_dma_lli *lli)
 {
-	phys_addr_t p_lli = __virt_to_phys((unsigned long)lli);
+	phys_addr_t p_lli = virt_to_phys(lli);
 
 	dev_dbg(chan2dev(&vchan->vc.chan),
 		"\n\tdesc:   p - %pa v - 0x%p\n"
-- 
1.7.0.4


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/sun6i-dma.c: In function 'sun6i_dma_dump_chan_regs':
drivers/dma/sun6i-dma.c:203:2: error: implicit declaration of function '__virt_to_phys' [-Werror=implicit-function-declaration]
  phys_addr_t reg = __virt_to_phys((unsigned long)pchan->base);
  ^

Caused by commit 555859308723 ("dmaengine: sun6i: Add driver for the
Allwinner A31 DMA controller").  Presumably missing an include file.

I have used the slave-dma tree from next-20140725 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/netdevice.h:38:0,
                 from arch/x86/net/bpf_jit_comp.c:12:
include/linux/dmaengine.h:973:1: error: expected identifier or '(' before '>>' token

And many, many more :-(

Caused by commit 896b29f155cf ("Merge branch 'for-linus' into next").

Please at least build test your tree *before* publishing it :-(

I have used the slave-dma tree from next-20130328 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

On Tue, Apr 02, 2013 at 12:57:11PM +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/netdevice.h:38:0,
>                  from arch/x86/net/bpf_jit_comp.c:12:
> include/linux/dmaengine.h:973:1: error: expected identifier or '(' before '>>' token
> 
> And many, many more :-(
> 
> Caused by commit 896b29f155cf ("Merge branch 'for-linus' into next").
> 
> Please at least build test your tree *before* publishing it :-(
Sorry, I had fixed it up early today but looks like have push didnt happen.
Its pushed now

> 
> I have used the slave-dma tree from next-20130328 for today.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Mon, Jan 07, 2013 at 11:26:37AM +1100, Stephen Rothwell wrote:
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
Hi Stephen,

I rebased the tree last night and messed up at two places. Viresh helped to fix
one. I have pushed the fixed tree now. My limited build test looks fine now

--
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1923 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/dmatest.c: In function 'unmap_dst':
drivers/dma/dmatest.c:244:21: error: invalid storage class for function 'min_odd'
drivers/dma/dmatest.c:244:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
drivers/dma/dmatest.c:265:12: error: invalid storage class for function 'dmatest_func'
drivers/dma/dmatest.c:550:13: error: invalid storage class for function 'dmatest_cleanup_channel'
drivers/dma/dmatest.c:570:12: error: invalid storage class for function 'dmatest_add_threads'
drivers/dma/dmatest.c:614:12: error: invalid storage class for function 'dmatest_add_channel'
drivers/dma/dmatest.c:652:13: error: invalid storage class for function 'filter'
drivers/dma/dmatest.c:660:19: error: invalid storage class for function 'dmatest_init'
drivers/dma/dmatest.c:685:1: error: invalid storage class for function '__inittest'
drivers/dma/dmatest.c:685:1: warning: 'alias' attribute ignored [-Wattributes]
drivers/dma/dmatest.c:687:20: error: invalid storage class for function 'dmatest_exit'
drivers/dma/dmatest.c:687:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
drivers/dma/dmatest.c:701:1: error: invalid storage class for function '__exittest'
drivers/dma/dmatest.c:701:1: warning: 'alias' attribute ignored [-Wattributes]
drivers/dma/dmatest.c:703:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
drivers/dma/dmatest.c:704:1: error: expected declaration or statement at end of input

Caused by commit 98edb45b7ba0 ("dmatest: adjust invalid module parameters
for number of source buffers").   You build tested this, right?

I have used the slave-dma tree from next-20130104 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Zhangfei Gao]

On Thu, 2012-06-21 at 22:01 -0700, Vinod Koul wrote:
> On Fri, 2012-06-22 at 13:00 +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/dma/mmp_tdma.c:21:27: fatal error: mach/regs-icu.h: No such file or directory
> > 
> > Caused by commit c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma
> > support").
> > 
> > I have used the slave-dma tree from next-20120621 for today.
> Thanks Stephen,
> 
> It should not build for this target!. I will added the below patch to
> fix the failure
> 
> >From 0efc8562577cd6a022b8b42d58fcf58ffc2a91d3 Mon Sep 17 00:00:00 2001
> From: Vinod Koul <vinod.koul@linux.intel.com>
> Date: Fri, 22 Jun 2012 10:29:53 +0530
> Subject: [PATCH] dmaengine: mmp_tdma: fix the arch dependency
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
> ---
>  drivers/dma/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index 90fec0e..d45cf1b 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -276,7 +276,7 @@ config DMA_SA11X0
>  
>  config MMP_TDMA
>  	bool "MMP Two-Channel DMA support"
> -	default ARCH_MMP
> +	depends on ARCH_MMP
>  	select DMA_ENGINE
>  	help
>  	  Support the MMP Two-Channel DMA engine.
> -- 
> 1.7.0.4
> 

Thanks Vinod and Stephen, sorry for the trouble.
> 

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Fri, 2012-06-22 at 13:00 +1000, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/dma/mmp_tdma.c:21:27: fatal error: mach/regs-icu.h: No such file or directory
> 
> Caused by commit c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma
> support").
> 
> I have used the slave-dma tree from next-20120621 for today.
Thanks Stephen,

It should not build for this target!. I will added the below patch to
fix the failure

>From 0efc8562577cd6a022b8b42d58fcf58ffc2a91d3 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Fri, 22 Jun 2012 10:29:53 +0530
Subject: [PATCH] dmaengine: mmp_tdma: fix the arch dependency

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---
 drivers/dma/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 90fec0e..d45cf1b 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -276,7 +276,7 @@ config DMA_SA11X0
 
 config MMP_TDMA
 	bool "MMP Two-Channel DMA support"
-	default ARCH_MMP
+	depends on ARCH_MMP
 	select DMA_ENGINE
 	help
 	  Support the MMP Two-Channel DMA engine.
-- 
1.7.0.4


-- 
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/mmp_tdma.c:21:27: fatal error: mach/regs-icu.h: No such file or directory

Caused by commit c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma
support").

I have used the slave-dma tree from next-20120621 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the slave-dma tree

[Vinod Koul]

On Tue, 2012-03-27 at 11:52 +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/dma/imx-dma.c:31:22: fatal error: mach/dma.h: No such file or directory
> 
> Caused by commit 6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c
> with imx-dma.c").
Thanks Stephen,

This should have depends on ARCH_MXS at least and should not have built
for x86_64. Below patch should fix it and I will apply this.

> 
> I have used the slave-dma tree from next-20120326 for today.
> 
> I was wondering why this new work appeared during the merge window ...
I had this series pending and wanted to get this merged but it didn't
apply for me last week and I was out for the long weekend :(
So merged on first chance I got back.

Tree is frozen now, barring any other hiccups. Sorry for the issue
--------------------------------x-------------------x----------------------

>From 9da98b21787488f9d99b7f93b42aee95bfd07c49 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Tue, 27 Mar 2012 13:53:00 +0530
Subject: [PATCH] dmaengine: imx: fix the build failure on x64

commit 6bd081277ea0 "dmaengine: imx-dma: merge old dma-v1.c with
imx-dma.c" removed the dependency in config for the imx dma driver,
whereas it should depend on ARCH_MXS

Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---
 drivers/dma/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b4a53a0..34e48d9 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -230,6 +230,7 @@ config IMX_SDMA
 
 config IMX_DMA
 	tristate "i.MX DMA support"
+	depends on ARCH_MXC
 	select DMA_ENGINE
 	help
 	  Support the i.MX DMA engine. This engine is integrated into
-- 
1.7.0.4


-- 
~Vinod

linux-next: build failure after merge of the slave-dma tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 500 bytes --]

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/imx-dma.c:31:22: fatal error: mach/dma.h: No such file or directory

Caused by commit 6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c
with imx-dma.c").

I have used the slave-dma tree from next-20120326 for today.

I was wondering why this new work appeared during the merge window ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]