dmaengine Archive on lore.kernel.org
 help / color / Atom feed
* Re: linux-next: build failure after merge of the slave-dma tree
       [not found]   ` <58c9b815-9bfc-449c-6017-c6da582dffc5@linaro.org>
@ 2019-07-08  4:17     ` Vinod Koul
  2019-07-08  4:54       ` Robin Gong
  0 siblings, 1 reply; 2+ messages in thread
From: Vinod Koul @ 2019-07-08  4:17 UTC (permalink / raw)
  To: Robin Gong
  Cc: dma, Stephen Rothwell, John Garry, Arnd Bergmann, Rob Herring,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Angelo Dureghello

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

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

* RE: linux-next: build failure after merge of the slave-dma tree
  2019-07-08  4:17     ` linux-next: build failure after merge of the slave-dma tree Vinod Koul
@ 2019-07-08  4:54       ` Robin Gong
  0 siblings, 0 replies; 2+ messages in thread
From: Robin Gong @ 2019-07-08  4:54 UTC (permalink / raw)
  To: Vinod Koul
  Cc: dma, Stephen Rothwell, John Garry, Arnd Bergmann, Rob Herring,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Angelo Dureghello

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.

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

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20190704173108.0646eef8@canb.auug.org.au>
     [not found] ` <VE1PR04MB6638080C43EC68EFF9F7B38A89F60@VE1PR04MB6638.eurprd04.prod.outlook.com>
     [not found]   ` <58c9b815-9bfc-449c-6017-c6da582dffc5@linaro.org>
2019-07-08  4:17     ` linux-next: build failure after merge of the slave-dma tree Vinod Koul
2019-07-08  4:54       ` Robin Gong

dmaengine Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dmaengine/0 dmaengine/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dmaengine dmaengine/ https://lore.kernel.org/dmaengine \
		dmaengine@vger.kernel.org
	public-inbox-index dmaengine

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.dmaengine


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git