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>, Dan Williams <dan.j.williams@intel.com>, Jassi Brar <jassisinghbrar@gmail.com>, Kukjin Kim <kgene.kim@samsung.com>, Grant Likely <grant.likely@secretlab.ca>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Boojin Kim <boojin.kim@samsung.com> Subject: [PATCH V4 02/14] DMA: PL330: Update PL330 DMA API driver Date: Mon, 25 Jul 2011 10:28:20 +0900 [thread overview] Message-ID: <1311557312-26107-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1311557312-26107-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> Cc: 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 | 31 ++++++++++++++++--------------- include/linux/amba/pl330.h | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 25cf327..569cb14 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 b7ecf47..586ab39 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -455,7 +455,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch) async_tx_ack(&desc->txd); desc->req.rqtype = peri->rqtype; - desc->req.peri = peri->peri_id; + desc->req.peri = pch->chan.chan_id; dma_async_tx_descriptor_init(&desc->txd, &pch->chan); @@ -577,7 +577,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)) @@ -594,7 +594,6 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, } addr = peri->fifo_addr; - burst_size = peri->burst_sz; first = NULL; @@ -642,7 +641,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 = peri->burst_sz; desc->rqcfg.brst_len = 1; } @@ -748,17 +747,19 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) struct dma_pl330_peri *peri = &pdat->peri[i]; pch = &pdmac->peripherals[i]; - switch (peri->rqtype) { - case MEMTOMEM: - dma_cap_set(DMA_MEMCPY, pd->cap_mask); - break; - case MEMTODEV: - case DEVTOMEM: - dma_cap_set(DMA_SLAVE, pd->cap_mask); - break; - default: - dev_err(&adev->dev, "DEVTODEV Not Supported\n"); - continue; + if (peri) { + switch (peri->rqtype) { + case MEMTOMEM: + dma_cap_set(DMA_MEMCPY, pd->cap_mask); + break; + case MEMTODEV: + case DEVTOMEM: + dma_cap_set(DMA_SLAVE, pd->cap_mask); + break; + default: + dev_err(&adev->dev, "DEVTODEV Not Supported\n"); + continue; + } } INIT_LIST_HEAD(&pch->work_list); diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h index cbee7de..17b0ada 100644 --- a/include/linux/amba/pl330.h +++ b/include/linux/amba/pl330.h @@ -19,7 +19,7 @@ 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 */ -- 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 V4 02/14] DMA: PL330: Update PL330 DMA API driver Date: Mon, 25 Jul 2011 10:28:20 +0900 [thread overview] Message-ID: <1311557312-26107-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1311557312-26107-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> Cc: 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 | 31 ++++++++++++++++--------------- include/linux/amba/pl330.h | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 25cf327..569cb14 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 b7ecf47..586ab39 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -455,7 +455,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch) async_tx_ack(&desc->txd); desc->req.rqtype = peri->rqtype; - desc->req.peri = peri->peri_id; + desc->req.peri = pch->chan.chan_id; dma_async_tx_descriptor_init(&desc->txd, &pch->chan); @@ -577,7 +577,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)) @@ -594,7 +594,6 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, } addr = peri->fifo_addr; - burst_size = peri->burst_sz; first = NULL; @@ -642,7 +641,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 = peri->burst_sz; desc->rqcfg.brst_len = 1; } @@ -748,17 +747,19 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) struct dma_pl330_peri *peri = &pdat->peri[i]; pch = &pdmac->peripherals[i]; - switch (peri->rqtype) { - case MEMTOMEM: - dma_cap_set(DMA_MEMCPY, pd->cap_mask); - break; - case MEMTODEV: - case DEVTOMEM: - dma_cap_set(DMA_SLAVE, pd->cap_mask); - break; - default: - dev_err(&adev->dev, "DEVTODEV Not Supported\n"); - continue; + if (peri) { + switch (peri->rqtype) { + case MEMTOMEM: + dma_cap_set(DMA_MEMCPY, pd->cap_mask); + break; + case MEMTODEV: + case DEVTOMEM: + dma_cap_set(DMA_SLAVE, pd->cap_mask); + break; + default: + dev_err(&adev->dev, "DEVTODEV Not Supported\n"); + continue; + } } INIT_LIST_HEAD(&pch->work_list); diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h index cbee7de..17b0ada 100644 --- a/include/linux/amba/pl330.h +++ b/include/linux/amba/pl330.h @@ -19,7 +19,7 @@ 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 */ -- 1.7.1
next prev parent reply other threads:[~2011-07-25 1:34 UTC|newest] Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-25 1:28 [RESEND] [PATCH V4 0/14] To use DMA generic APIs for Samsung DMA Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 01/14] DMA: PL330: Add support runtime PM for PL330 DMAC Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-26 6:03 ` Chanwoo Choi 2011-07-26 6:03 ` Chanwoo Choi 2011-07-25 1:28 ` Boojin Kim [this message] 2011-07-25 1:28 ` [PATCH V4 02/14] DMA: PL330: Update PL330 DMA API driver Boojin Kim 2011-07-25 8:57 ` Jassi Brar 2011-07-25 8:57 ` Jassi Brar 2011-07-25 9:48 ` Boojin Kim 2011-07-25 9:48 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 03/14] DMA: PL330: Support DMA_SLAVE_CONFIG command Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 10:26 ` Vinod Koul 2011-07-25 10:26 ` Vinod Koul 2011-07-25 12:51 ` Boojin Kim 2011-07-25 12:51 ` Boojin Kim 2011-07-25 13:48 ` Vinod Koul 2011-07-25 13:48 ` Vinod Koul 2011-07-26 13:04 ` Boojin Kim 2011-07-26 13:04 ` Boojin Kim 2011-07-26 13:12 ` Russell King - ARM Linux 2011-07-26 13:12 ` Russell King - ARM Linux 2011-07-25 1:28 ` [PATCH V4 04/14] DMA: PL330: Add DMA_CYCLIC capability Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 9:27 ` Russell King - ARM Linux 2011-07-25 9:27 ` Russell King - ARM Linux 2011-07-25 10:31 ` Boojin Kim 2011-07-25 10:31 ` Boojin Kim 2011-07-25 10:36 ` Russell King - ARM Linux 2011-07-25 10:36 ` Russell King - ARM Linux 2011-07-25 10:48 ` Vinod Koul 2011-07-25 10:48 ` Vinod Koul 2011-07-25 10:57 ` Russell King - ARM Linux 2011-07-25 10:57 ` Russell King - ARM Linux 2011-07-25 11:01 ` Vinod Koul 2011-07-25 11:01 ` Vinod Koul 2011-07-25 11:39 ` Russell King - ARM Linux 2011-07-25 11:39 ` Russell King - ARM Linux 2011-07-25 12:01 ` Vinod Koul 2011-07-25 12:01 ` Vinod Koul 2011-07-26 7:57 ` [PATCH] Improve slave/cyclic DMA engine documentation (was: [PATCH V4 04/14] DMA: PL330: Add DMA_CYCLIC capability) Russell King - ARM Linux 2011-07-26 7:57 ` Russell King - ARM Linux 2011-07-26 9:35 ` Vinod Koul 2011-07-26 9:35 ` Vinod Koul 2011-07-26 14:37 ` Jassi Brar 2011-07-26 14:37 ` Jassi Brar 2011-07-26 17:20 ` Russell King - ARM Linux 2011-07-26 17:20 ` Russell King - ARM Linux 2011-07-26 17:55 ` Jassi Brar 2011-07-26 17:55 ` Jassi Brar 2011-07-26 18:03 ` Grant Likely 2011-07-26 18:03 ` Grant Likely 2011-07-26 18:16 ` Russell King - ARM Linux 2011-07-26 18:16 ` Russell King - ARM Linux 2011-07-27 2:38 ` Vinod Koul 2011-07-27 2:38 ` Vinod Koul 2011-07-27 9:01 ` Russell King - ARM Linux 2011-07-27 9:01 ` Russell King - ARM Linux 2011-07-27 9:06 ` Koul, Vinod 2011-07-27 9:06 ` Koul, Vinod 2011-07-26 13:25 ` Russell King - ARM Linux 2011-07-26 13:25 ` Russell King - ARM Linux 2011-07-25 12:36 ` [PATCH V4 04/14] DMA: PL330: Add DMA_CYCLIC capability Boojin Kim 2011-07-25 12:36 ` Boojin Kim 2011-07-25 12:34 ` Boojin Kim 2011-07-25 12:34 ` Boojin Kim 2011-07-25 11:24 ` Jassi Brar 2011-07-25 11:24 ` Jassi Brar 2011-07-26 12:28 ` Boojin Kim 2011-07-26 12:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 05/14] ARM: SAMSUNG: Update to use PL330-DMA driver Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 10:52 ` Vinod Koul 2011-07-25 10:52 ` Vinod Koul 2011-07-25 11:31 ` Jassi Brar 2011-07-25 11:31 ` Jassi Brar 2011-07-25 1:28 ` [PATCH V4 06/14] ARM: SAMSUNG: Add common DMA operations Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 9:36 ` Russell King - ARM Linux 2011-07-25 9:36 ` Russell King - ARM Linux 2011-07-25 9:57 ` Boojin Kim 2011-07-25 9:57 ` Boojin Kim 2011-07-25 11:51 ` Jassi Brar 2011-07-25 11:51 ` Jassi Brar 2011-07-26 8:02 ` Russell King - ARM Linux 2011-07-26 8:02 ` Russell King - ARM Linux 2011-07-26 17:43 ` Jassi Brar 2011-07-26 17:43 ` Jassi Brar 2011-07-26 18:14 ` Russell King - ARM Linux 2011-07-26 18:14 ` Russell King - ARM Linux 2011-07-26 19:54 ` Jassi Brar 2011-07-26 19:54 ` Jassi Brar 2011-07-26 9:35 ` Boojin Kim 2011-07-26 9:35 ` Boojin Kim 2011-07-27 1:33 ` Jassi Brar 2011-07-27 1:33 ` Jassi Brar 2011-07-27 5:17 ` Boojin Kim 2011-07-27 5:17 ` Boojin Kim 2011-07-27 7:57 ` Jassi Brar 2011-07-27 7:57 ` Jassi Brar 2011-07-28 0:38 ` Boojin Kim 2011-07-28 0:38 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 07/14] ARM: EXYNOS4: Use generic DMA PL330 driver Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 11:59 ` Jassi Brar 2011-07-25 11:59 ` Jassi Brar 2011-07-25 12:59 ` Boojin Kim 2011-07-25 12:59 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 08/14] ARM: S5PV210: " Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 09/14] ARM: S5PC100: " Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 10/14] ARM: S5P64X0: " Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 11/14] ARM: SAMSUNG: Remove S3C-PL330-DMA driver Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 12/14] spi/s3c64xx: Add support DMA engine API Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 9:40 ` Russell King - ARM Linux 2011-07-25 9:40 ` Russell King - ARM Linux 2011-07-25 10:34 ` Boojin Kim 2011-07-25 10:34 ` Boojin Kim 2011-07-25 11:17 ` Vinod Koul 2011-07-25 11:17 ` Vinod Koul 2011-07-26 9:31 ` Boojin Kim 2011-07-26 9:31 ` Boojin Kim 2011-07-26 10:14 ` Vinod Koul 2011-07-26 10:14 ` Vinod Koul 2011-07-27 5:05 ` Boojin Kim 2011-07-27 5:05 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 13/14] ASoC: Samsung: Update DMA interface Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 1:28 ` [PATCH V4 14/14] ARM: SAMSUNG: Remove Samsung specific enum type for dma direction Boojin Kim 2011-07-25 1:28 ` Boojin Kim 2011-07-25 12:08 ` Jassi Brar 2011-07-25 12:08 ` Jassi Brar 2011-07-25 21:15 ` Grant Likely 2011-07-25 21:15 ` Grant Likely 2011-07-28 1:23 ` Boojin Kim 2011-07-28 1:23 ` Boojin Kim 2011-07-25 10:17 ` [RESEND] [PATCH V4 0/14] To use DMA generic APIs for Samsung DMA Vinod Koul 2011-07-25 10:17 ` Vinod Koul 2011-07-25 11:09 ` Vinod Koul 2011-07-25 11:09 ` Vinod Koul
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=1311557312-26107-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=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --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.