diff mbox

[v7,02/15] DMA: PL330: Update PL330 DMA API driver

Message ID 1314238425-6480-3-git-send-email-boojin.kim@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

boojin.kim Aug. 25, 2011, 2:13 a.m. UTC 
This patch updates following 3 items.
1. Removes unneccessary code.
2. Add AMBA, PL330 configuration
3. Change the meaning of 'peri_id' variable
   from PL330 event number to specific dma id by user.

Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
 drivers/dma/Kconfig        |    3 ++-
 drivers/dma/pl330.c        |   14 +++++++++-----
 include/linux/amba/pl330.h |    6 +-----
 3 files changed, 12 insertions(+), 11 deletions(-)

Comments

Vinod Koul Aug. 29, 2011, 1:55 p.m. UTC | #1 
On Thu, 2011-08-25 at 11:13 +0900, Boojin Kim wrote:
> This patch updates following 3 items.
> @@ -69,6 +70,10 @@ struct dma_pl330_chan {
>  	 * NULL if the channel is available to be acquired.
>  	 */
>  	void *pl330_chid;
> +
> +	/* For D-to-M and M-to-D channels */
> +	int burst_sz; /* the peripheral fifo width */
> +	dma_addr_t fifo_addr;
>  };
Why should you store peripheral address and burst size in channel
structure. You should take these from the API and dma_slave_structure
>  
>  struct dma_pl330_dmac {
> @@ -456,7 +461,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
>  
>  	if (peri) {
>  		desc->req.rqtype = peri->rqtype;
> -		desc->req.peri = peri->peri_id;
> +		desc->req.peri = pch->chan.chan_id;
>  	} else {
>  		desc->req.rqtype = MEMTOMEM;
>  		desc->req.peri = 0;
> @@ -582,7 +587,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
>  	struct dma_pl330_peri *peri = chan->private;
>  	struct scatterlist *sg;
>  	unsigned long flags;
> -	int i, burst_size;
> +	int i;
>  	dma_addr_t addr;
>  
>  	if (unlikely(!pch || !sgl || !sg_len || !peri))
> @@ -598,8 +603,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
>  		return NULL;
>  	}
>  
> -	addr = peri->fifo_addr;
> -	burst_size = peri->burst_sz;
> +	addr = pch->fifo_addr;
what you removed is the correct way to do...
Vinod Koul Aug. 29, 2011, 2:22 p.m. UTC | #2 
On Mon, 2011-08-29 at 19:25 +0530, Vinod Koul wrote:
> On Thu, 2011-08-25 at 11:13 +0900, Boojin Kim wrote:
> > This patch updates following 3 items.
> > @@ -69,6 +70,10 @@ struct dma_pl330_chan {
> >  	 * NULL if the channel is available to be acquired.
> >  	 */
> >  	void *pl330_chid;
> > +
> > +	/* For D-to-M and M-to-D channels */
> > +	int burst_sz; /* the peripheral fifo width */
> > +	dma_addr_t fifo_addr;
> >  };
> Why should you store peripheral address and burst size in channel
> structure. You should take these from the API and dma_slave_structure
Ignore my comment for burst size, but is valid for peripheral address
Vinod Koul Aug. 29, 2011, 2:25 p.m. UTC | #3 
On Mon, 2011-08-29 at 19:52 +0530, Vinod Koul wrote:
> On Mon, 2011-08-29 at 19:25 +0530, Vinod Koul wrote:
> > On Thu, 2011-08-25 at 11:13 +0900, Boojin Kim wrote:
> > > This patch updates following 3 items.
> > > @@ -69,6 +70,10 @@ struct dma_pl330_chan {
> > >  	 * NULL if the channel is available to be acquired.
> > >  	 */
> > >  	void *pl330_chid;
> > > +
> > > +	/* For D-to-M and M-to-D channels */
> > > +	int burst_sz; /* the peripheral fifo width */
> > > +	dma_addr_t fifo_addr;
> > >  };
> > Why should you store peripheral address and burst size in channel
> > structure. You should take these from the API and dma_slave_structure
> Ignore my comment for burst size, but is valid for peripheral address
Never mind this one as well, I need some more coffee...
diff mbox

Patch

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 2e3b3d3..ab8f469 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -193,7 +193,8 @@  config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 config PL330_DMA
 	tristate "DMA API Driver for PL330"
 	select DMA_ENGINE
-	depends on PL330
+	depends on ARM_AMBA
+	select PL330
 	help
 	  Select if your platform has one or more PL330 DMACs.
 	  You need to provide platform specific settings via
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 0b99af1..d5829c7 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -18,6 +18,7 @@ 
 #include <linux/amba/bus.h>
 #include <linux/amba/pl330.h>
 #include <linux/pm_runtime.h>
+#include <linux/scatterlist.h>
 
 #define NR_DEFAULT_DESC	16
 
@@ -69,6 +70,10 @@  struct dma_pl330_chan {
 	 * NULL if the channel is available to be acquired.
 	 */
 	void *pl330_chid;
+
+	/* For D-to-M and M-to-D channels */
+	int burst_sz; /* the peripheral fifo width */
+	dma_addr_t fifo_addr;
 };
 
 struct dma_pl330_dmac {
@@ -456,7 +461,7 @@  static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
 
 	if (peri) {
 		desc->req.rqtype = peri->rqtype;
-		desc->req.peri = peri->peri_id;
+		desc->req.peri = pch->chan.chan_id;
 	} else {
 		desc->req.rqtype = MEMTOMEM;
 		desc->req.peri = 0;
@@ -582,7 +587,7 @@  pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 	struct dma_pl330_peri *peri = chan->private;
 	struct scatterlist *sg;
 	unsigned long flags;
-	int i, burst_size;
+	int i;
 	dma_addr_t addr;
 
 	if (unlikely(!pch || !sgl || !sg_len || !peri))
@@ -598,8 +603,7 @@  pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 		return NULL;
 	}
 
-	addr = peri->fifo_addr;
-	burst_size = peri->burst_sz;
+	addr = pch->fifo_addr;
 
 	first = NULL;
 
@@ -647,7 +651,7 @@  pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 				sg_dma_address(sg), addr, sg_dma_len(sg));
 		}
 
-		desc->rqcfg.brst_size = burst_size;
+		desc->rqcfg.brst_size = pch->burst_sz;
 		desc->rqcfg.brst_len = 1;
 	}
 
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index cbee7de..d12f077 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -19,12 +19,8 @@  struct dma_pl330_peri {
 	 * Peri_Req i/f of the DMAC that is
 	 * peripheral could be reached from.
 	 */
-	u8 peri_id; /* {0, 31} */
+	u8 peri_id; /* specific dma id */
 	enum pl330_reqtype rqtype;
-
-	/* For M->D and D->M Channels */
-	int burst_sz; /* in power of 2 */
-	dma_addr_t fifo_addr;
 };
 
 struct dma_pl330_platdata {