From: Boojin Kim <boojin.kim@samsung.com> To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Vinod Koul <vinod.koul@intel.com>, Kukjin Kim <kgene.kim@samsung.com>, Dan Williams <dan.j.williams@intel.com>, Jassi Brar <jassisinghbrar@gmail.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Grant Likely <grant.likely@secretlab.ca>, Russell King <linux@arm.linux.org.uk>, Linus Walleij <linus.walleij@linaro.org>, Boojin Kim <boojin.kim@samsung.com> Subject: [PATCH v7 02/15] DMA: PL330: Update PL330 DMA API driver Date: Thu, 25 Aug 2011 11:13:32 +0900 [thread overview] Message-ID: <1314238425-6480-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1314238425-6480-1-git-send-email-boojin.kim@samsung.com> 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(-) 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 { -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: boojin.kim@samsung.com (Boojin Kim) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 02/15] DMA: PL330: Update PL330 DMA API driver Date: Thu, 25 Aug 2011 11:13:32 +0900 [thread overview] Message-ID: <1314238425-6480-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1314238425-6480-1-git-send-email-boojin.kim@samsung.com> 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(-) 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 { -- 1.7.1
next prev parent reply other threads:[~2011-08-25 2:28 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-25 2:13 To use DMA generic APIs for Samsung DMA Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 01/15] DMA: PL330: Add support runtime PM for PL330 DMAC Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` Boojin Kim [this message] 2011-08-25 2:13 ` [PATCH v7 02/15] DMA: PL330: Update PL330 DMA API driver Boojin Kim 2011-08-26 14:48 ` Jassi Brar 2011-08-26 14:48 ` Jassi Brar 2011-08-29 13:55 ` Vinod Koul 2011-08-29 13:55 ` Vinod Koul 2011-08-29 14:22 ` Vinod Koul 2011-08-29 14:22 ` Vinod Koul 2011-08-29 14:25 ` Vinod Koul 2011-08-29 14:25 ` Vinod Koul 2011-08-25 2:13 ` [PATCH v7 03/15] DMA: PL330: Modify device_control() Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-26 15:19 ` Jassi Brar 2011-08-26 15:19 ` Jassi Brar 2011-08-25 2:13 ` [PATCH v7 04/15] DMA: PL330: Add DMA_CYCLIC capability Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-26 15:25 ` Jassi Brar 2011-08-26 15:25 ` Jassi Brar 2011-08-25 2:13 ` [PATCH v7 05/15] ARM: SAMSUNG: Update to use PL330-DMA driver Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 06/15] ARM: SAMSUNG: Add common DMA operations Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 07/15] ARM: EXYNOS4: Use generic DMA PL330 driver Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 08/15] ARM: S5PV210: " Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 09/15] ARM: S5PC100: " Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 10/15] ARM: S5P64X0: " Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 11/15] ARM: SAMSUNG: Remove S3C-PL330-DMA driver Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 12/15] spi/s3c64xx: Add support DMA engine API Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 13/15] spi/s3c64xx: Merge dma control code Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 14/15] ASoC: Samsung: Update DMA interface Boojin Kim 2011-08-25 2:13 ` Boojin Kim 2011-08-25 2:13 ` [PATCH v7 15/15] ARM: SAMSUNG: Remove Samsung specific enum type for dma direction Boojin Kim 2011-08-25 2:13 ` Boojin Kim
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1314238425-6480-3-git-send-email-boojin.kim@samsung.com \ --to=boojin.kim@samsung.com \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=dan.j.williams@intel.com \ --cc=grant.likely@secretlab.ca \ --cc=jassisinghbrar@gmail.com \ --cc=kgene.kim@samsung.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.