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>, Boojin Kim <boojin.kim@samsung.com> Subject: [PATCH V4 03-1/13] DMA: PL330: Support DMA_SLAVE_CONFIG command Date: Wed, 20 Jul 2011 19:46:11 +0900 [thread overview] Message-ID: <1311158773-30314-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1311158773-30314-1-git-send-email-boojin.kim@samsung.com> Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> --- drivers/dma/pl330.c | 53 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 586ab39..880f010 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -256,25 +256,50 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan) static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg) { struct dma_pl330_chan *pch = to_pchan(chan); - struct dma_pl330_desc *desc; + struct dma_pl330_desc *desc, *_dt; unsigned long flags; + struct dma_pl330_dmac *pdmac = pch->dmac; + struct dma_slave_config *slave_config; + struct dma_pl330_peri *peri; + LIST_HEAD(list); - /* Only supports DMA_TERMINATE_ALL */ - if (cmd != DMA_TERMINATE_ALL) - return -ENXIO; - - spin_lock_irqsave(&pch->lock, flags); - - /* FLUSH the PL330 Channel thread */ - pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH); + switch (cmd) { + case DMA_TERMINATE_ALL: + spin_lock_irqsave(&pch->lock, flags); - /* Mark all desc done */ - list_for_each_entry(desc, &pch->work_list, node) - desc->status = DONE; + /* FLUSH the PL330 Channel thread */ + pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH); - spin_unlock_irqrestore(&pch->lock, flags); + /* Mark all desc done */ + list_for_each_entry_safe(desc, _dt, &pch->work_list , node) { + desc->status = DONE; + pch->completed = desc->txd.cookie; + list_move_tail(&desc->node, &list); + } - pl330_tasklet((unsigned long) pch); + list_splice_tail_init(&list, &pdmac->desc_pool); + spin_unlock_irqrestore(&pch->lock, flags); + break; + case DMA_SLAVE_CONFIG: + slave_config = (struct dma_slave_config *)arg; + peri = pch->chan.private; + + if (slave_config->direction == DMA_TO_DEVICE) { + if (slave_config->dst_addr) + peri->fifo_addr = slave_config->dst_addr; + if (slave_config->dst_addr_width) + peri->burst_sz = __ffs(slave_config->dst_addr_width); + } else if (slave_config->direction == DMA_FROM_DEVICE) { + if (slave_config->src_addr) + peri->fifo_addr = slave_config->src_addr; + if (slave_config->src_addr_width) + peri->burst_sz = __ffs(slave_config->src_addr_width); + } + break; + default: + dev_err(pch->dmac->pif.dev, "Not supported command.\n"); + return -ENXIO; + } return 0; } -- 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 03-1/13] DMA: PL330: Support DMA_SLAVE_CONFIG command Date: Wed, 20 Jul 2011 19:46:11 +0900 [thread overview] Message-ID: <1311158773-30314-3-git-send-email-boojin.kim@samsung.com> (raw) In-Reply-To: <1311158773-30314-1-git-send-email-boojin.kim@samsung.com> Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> --- drivers/dma/pl330.c | 53 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 586ab39..880f010 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -256,25 +256,50 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan) static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg) { struct dma_pl330_chan *pch = to_pchan(chan); - struct dma_pl330_desc *desc; + struct dma_pl330_desc *desc, *_dt; unsigned long flags; + struct dma_pl330_dmac *pdmac = pch->dmac; + struct dma_slave_config *slave_config; + struct dma_pl330_peri *peri; + LIST_HEAD(list); - /* Only supports DMA_TERMINATE_ALL */ - if (cmd != DMA_TERMINATE_ALL) - return -ENXIO; - - spin_lock_irqsave(&pch->lock, flags); - - /* FLUSH the PL330 Channel thread */ - pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH); + switch (cmd) { + case DMA_TERMINATE_ALL: + spin_lock_irqsave(&pch->lock, flags); - /* Mark all desc done */ - list_for_each_entry(desc, &pch->work_list, node) - desc->status = DONE; + /* FLUSH the PL330 Channel thread */ + pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH); - spin_unlock_irqrestore(&pch->lock, flags); + /* Mark all desc done */ + list_for_each_entry_safe(desc, _dt, &pch->work_list , node) { + desc->status = DONE; + pch->completed = desc->txd.cookie; + list_move_tail(&desc->node, &list); + } - pl330_tasklet((unsigned long) pch); + list_splice_tail_init(&list, &pdmac->desc_pool); + spin_unlock_irqrestore(&pch->lock, flags); + break; + case DMA_SLAVE_CONFIG: + slave_config = (struct dma_slave_config *)arg; + peri = pch->chan.private; + + if (slave_config->direction == DMA_TO_DEVICE) { + if (slave_config->dst_addr) + peri->fifo_addr = slave_config->dst_addr; + if (slave_config->dst_addr_width) + peri->burst_sz = __ffs(slave_config->dst_addr_width); + } else if (slave_config->direction == DMA_FROM_DEVICE) { + if (slave_config->src_addr) + peri->fifo_addr = slave_config->src_addr; + if (slave_config->src_addr_width) + peri->burst_sz = __ffs(slave_config->src_addr_width); + } + break; + default: + dev_err(pch->dmac->pif.dev, "Not supported command.\n"); + return -ENXIO; + } return 0; } -- 1.7.1
next prev parent reply other threads:[~2011-07-20 10:53 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-20 10:46 [PATCH V4 00/13] To use DMA generic APIs for Samsung DMA Boojin Kim 2011-07-20 10:46 ` Boojin Kim 2011-07-20 10:46 ` [PATCH V4 01/13] DMA: PL330: Add support runtime PM for PL330 DMAC Boojin Kim 2011-07-20 10:46 ` Boojin Kim 2011-07-20 18:35 ` Jassi Brar 2011-07-20 18:35 ` Jassi Brar 2011-07-20 10:46 ` Boojin Kim [this message] 2011-07-20 10:46 ` [PATCH V4 03-1/13] DMA: PL330: Support DMA_SLAVE_CONFIG command Boojin Kim 2011-07-20 19:17 ` Jassi Brar 2011-07-20 19:17 ` Jassi Brar 2011-07-21 4:13 ` Boojin Kim 2011-07-21 4:13 ` Boojin Kim 2011-07-21 5:00 ` Jassi Brar 2011-07-21 5:00 ` Jassi Brar 2011-07-21 6:34 ` Boojin Kim 2011-07-21 6:34 ` Boojin Kim 2011-07-21 7:31 ` Jassi Brar 2011-07-21 7:31 ` Jassi Brar 2011-07-21 8:11 ` Russell King - ARM Linux 2011-07-21 8:11 ` Russell King - ARM Linux 2011-07-21 9:14 ` Jassi Brar 2011-07-21 9:14 ` Jassi Brar 2011-07-21 10:23 ` Linus Walleij 2011-07-21 10:23 ` Linus Walleij 2011-07-21 14:28 ` Jassi Brar 2011-07-21 14:28 ` Jassi Brar 2011-07-21 15:28 ` Russell King - ARM Linux 2011-07-21 15:28 ` Russell King - ARM Linux 2011-07-22 13:59 ` Linus Walleij 2011-07-22 13:59 ` Linus Walleij 2011-07-21 11:29 ` Russell King - ARM Linux 2011-07-21 11:29 ` Russell King - ARM Linux 2011-07-21 15:12 ` Jassi Brar 2011-07-21 15:12 ` Jassi Brar 2011-07-21 15:23 ` Russell King - ARM Linux 2011-07-21 15:23 ` Russell King - ARM Linux 2011-07-21 15:56 ` Jassi Brar 2011-07-21 15:56 ` Jassi Brar 2011-07-21 16:02 ` Russell King - ARM Linux 2011-07-21 16:02 ` Russell King - ARM Linux 2011-07-22 5:42 ` Jassi Brar 2011-07-22 5:42 ` Jassi Brar 2011-07-25 2:10 ` Boojin Kim 2011-07-25 2:10 ` Boojin Kim 2011-07-20 10:46 ` [PATCH V4 03-2/13] DMA: PL330: Add DMA_CYCLIC capability Boojin Kim 2011-07-20 10:46 ` Boojin Kim 2011-07-20 10:46 ` [PATCH V4 05/13] ARM: SAMSUNG: Add common DMA operations Boojin Kim 2011-07-20 10:46 ` Boojin Kim 2011-07-20 16:04 ` [PATCH V4 00/13] To use DMA generic APIs for Samsung DMA Kukjin Kim 2011-07-20 16:04 ` Kukjin Kim 2011-07-22 12:07 ` Koul, Vinod 2011-07-22 12:07 ` Koul, Vinod
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=1311158773-30314-3-git-send-email-boojin.kim@samsung.com \ --to=boojin.kim@samsung.com \ --cc=dan.j.williams@intel.com \ --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.