LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang@linaro.org>
To: dan.j.williams@intel.com, vinod.koul@intel.com
Cc: eric.long@spreadtrum.com, broonie@kernel.org,
	dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
	baolin.wang@linaro.org
Subject: [PATCH 5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces
Date: Tue, 10 Apr 2018 15:46:07 +0800	[thread overview]
Message-ID: <0a9fa618bd74e74c135ebee2e40b30d361c1d905.1523346135.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <abdda9da96185f764d58bbf61db9010d0f72d1b3.1523346135.git.baolin.wang@linaro.org>
In-Reply-To: <abdda9da96185f764d58bbf61db9010d0f72d1b3.1523346135.git.baolin.wang@linaro.org>

This patch adds the 'device_config' and 'device_prep_slave_sg' interfaces
for users to configure DMA.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/dma/sprd-dma.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
index f8038de..c923fb0 100644
--- a/drivers/dma/sprd-dma.c
+++ b/drivers/dma/sprd-dma.c
@@ -869,6 +869,52 @@ static int sprd_dma_config(struct dma_chan *chan, struct sprd_dma_desc *sdesc,
 	return vchan_tx_prep(&schan->vc, &sdesc->vd, flags);
 }
 
+static struct dma_async_tx_descriptor *
+sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
+		       unsigned int sglen, enum dma_transfer_direction dir,
+		       unsigned long flags, void *context)
+{
+	struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);
+	struct sprd_dma_config *slave_cfg = &schan->slave_cfg;
+	struct sprd_dma_desc *sdesc;
+	struct scatterlist *sg;
+	int ret, i;
+
+	/* TODO: now we only support one sg for each DMA configuration. */
+	if (!is_slave_direction(slave_cfg->config.direction) || sglen > 1)
+		return NULL;
+
+	sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT);
+	if (!sdesc)
+		return NULL;
+
+	for_each_sg(sgl, sg, sglen, i) {
+		if (slave_cfg->config.direction == DMA_MEM_TO_DEV)
+			slave_cfg->config.src_addr = sg_dma_address(sg);
+		else
+			slave_cfg->config.dst_addr = sg_dma_address(sg);
+	}
+
+	ret = sprd_dma_config(chan, sdesc, slave_cfg);
+	if (ret) {
+		kfree(sdesc);
+		return NULL;
+	}
+
+	return vchan_tx_prep(&schan->vc, &sdesc->vd, flags);
+}
+
+static int sprd_dma_slave_config(struct dma_chan *chan,
+				 struct dma_slave_config *config)
+{
+	struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);
+	struct sprd_dma_config *slave_cfg =
+		container_of(config, struct sprd_dma_config, config);
+
+	memcpy(&schan->slave_cfg, slave_cfg, sizeof(*slave_cfg));
+	return 0;
+}
+
 static int sprd_dma_pause(struct dma_chan *chan)
 {
 	struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);
@@ -996,6 +1042,8 @@ static int sprd_dma_probe(struct platform_device *pdev)
 	sdev->dma_dev.device_tx_status = sprd_dma_tx_status;
 	sdev->dma_dev.device_issue_pending = sprd_dma_issue_pending;
 	sdev->dma_dev.device_prep_dma_memcpy = sprd_dma_prep_dma_memcpy;
+	sdev->dma_dev.device_prep_slave_sg = sprd_dma_prep_slave_sg;
+	sdev->dma_dev.device_config = sprd_dma_slave_config;
 	sdev->dma_dev.device_pause = sprd_dma_pause;
 	sdev->dma_dev.device_resume = sprd_dma_resume;
 	sdev->dma_dev.device_terminate_all = sprd_dma_terminate_all;
-- 
1.7.9.5

  parent reply	other threads:[~2018-04-10  7:47 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-10  7:46 [PATCH 1/5] dmaengine: sprd: Define the DMA transfer step type Baolin Wang
2018-04-10  7:46 ` [PATCH 2/5] dmaengine: sprd: Define the DMA data width type Baolin Wang
2018-04-10  7:46 ` [PATCH 3/5] dmaengine: sprd: Move DMA request mode and interrupt type into head file Baolin Wang
2018-04-10  7:46 ` [PATCH 4/5] dmaengine: sprd: Add Spreadtrum DMA configuration Baolin Wang
2018-04-11  9:36   ` Vinod Koul
2018-04-11 12:13     ` Baolin Wang
2018-04-12  9:37       ` Vinod Koul
2018-04-12 11:30         ` Baolin Wang
2018-04-12 11:36           ` Baolin Wang
2018-04-13  3:43             ` Vinod Koul
2018-04-13  6:17               ` Baolin Wang
2018-04-13  6:36                 ` Vinod Koul
2018-04-13  6:41                   ` Baolin Wang
2018-04-13 10:11                     ` Vinod Koul
2018-04-13 10:48                       ` Baolin Wang
2018-04-16  3:58                     ` Vinod Koul
2018-04-16  6:32                       ` Baolin Wang
2018-04-16 15:35                         ` Vinod Koul
2018-04-17  6:06                           ` Baolin Wang
2018-04-13  3:39           ` Vinod Koul
2018-04-13  5:44             ` Baolin Wang
2018-04-10  7:46 ` Baolin Wang [this message]
2018-04-11  9:40   ` [PATCH 5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Vinod Koul
2018-04-11 10:51     ` Baolin Wang
2018-04-17 10:45   ` Lars-Peter Clausen
2018-04-18  5:40     ` Baolin Wang
2018-04-11  9:24 ` [PATCH 1/5] dmaengine: sprd: Define the DMA transfer step type Vinod Koul
2018-04-11 10:49   ` Baolin Wang

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=0a9fa618bd74e74c135ebee2e40b30d361c1d905.1523346135.git.baolin.wang@linaro.org \
    --to=baolin.wang@linaro.org \
    --cc=broonie@kernel.org \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=eric.long@spreadtrum.com \
    --cc=linux-kernel@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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).