From: Vinod Koul <vinod.koul@intel.com> To: Baolin Wang <baolin.wang@linaro.org> Cc: dan.j.williams@intel.com, eric.long@spreadtrum.com, broonie@kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Date: Wed, 11 Apr 2018 15:10:01 +0530 [thread overview] Message-ID: <20180411094000.GD6014@localhost> (raw) On Tue, Apr 10, 2018 at 03:46:07PM +0800, Baolin Wang wrote: > 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) the slave direction check seems wrong to me. .device_config shall give you dma_slave_config. You should check here if dir passed is slave or not. If you want to check parameters in slave_config then please use .device_config > + 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); Nope slave_config specifies peripheral address and not memory one passed here
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vinod.koul@intel.com> To: Baolin Wang <baolin.wang@linaro.org> Cc: dan.j.williams@intel.com, eric.long@spreadtrum.com, broonie@kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Date: Wed, 11 Apr 2018 15:10:01 +0530 [thread overview] Message-ID: <20180411094000.GD6014@localhost> (raw) In-Reply-To: <0a9fa618bd74e74c135ebee2e40b30d361c1d905.1523346135.git.baolin.wang@linaro.org> On Tue, Apr 10, 2018 at 03:46:07PM +0800, Baolin Wang wrote: > 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) the slave direction check seems wrong to me. .device_config shall give you dma_slave_config. You should check here if dir passed is slave or not. If you want to check parameters in slave_config then please use .device_config > + 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); Nope slave_config specifies peripheral address and not memory one passed here -- ~Vinod
next reply other threads:[~2018-04-11 9:40 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-11 9:40 Vinod Koul [this message] 2018-04-11 9:40 ` [PATCH 5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Vinod Koul -- strict thread matches above, loose matches on Subject: below -- 2018-04-18 5:40 [5/5] " Baolin Wang 2018-04-18 5:40 ` [PATCH 5/5] " Baolin Wang 2018-04-17 10:45 [5/5] " Lars-Peter Clausen 2018-04-17 10:45 ` [PATCH 5/5] " Lars-Peter Clausen 2018-04-17 6:06 [4/5] dmaengine: sprd: Add Spreadtrum DMA configuration Baolin Wang 2018-04-17 6:06 ` [PATCH 4/5] " Baolin Wang 2018-04-16 15:35 [4/5] " Vinod Koul 2018-04-16 15:35 ` [PATCH 4/5] " Vinod Koul 2018-04-16 6:32 [4/5] " Baolin Wang 2018-04-16 6:32 ` [PATCH 4/5] " Baolin Wang 2018-04-16 3:58 [4/5] " Vinod Koul 2018-04-16 3:58 ` [PATCH 4/5] " Vinod Koul 2018-04-13 10:48 [4/5] " Baolin Wang 2018-04-13 10:48 ` [PATCH 4/5] " Baolin Wang 2018-04-13 10:11 [4/5] " Vinod Koul 2018-04-13 10:11 ` [PATCH 4/5] " Vinod Koul 2018-04-13 6:41 [4/5] " Baolin Wang 2018-04-13 6:41 ` [PATCH 4/5] " Baolin Wang 2018-04-13 6:36 [4/5] " Vinod Koul 2018-04-13 6:36 ` [PATCH 4/5] " Vinod Koul 2018-04-13 6:17 [4/5] " Baolin Wang 2018-04-13 6:17 ` [PATCH 4/5] " Baolin Wang 2018-04-13 5:44 [4/5] " Baolin Wang 2018-04-13 5:44 ` [PATCH 4/5] " Baolin Wang 2018-04-13 3:43 [4/5] " Vinod Koul 2018-04-13 3:43 ` [PATCH 4/5] " Vinod Koul 2018-04-13 3:39 [4/5] " Vinod Koul 2018-04-13 3:39 ` [PATCH 4/5] " Vinod Koul 2018-04-12 11:36 [4/5] " Baolin Wang 2018-04-12 11:36 ` [PATCH 4/5] " Baolin Wang 2018-04-12 11:30 [4/5] " Baolin Wang 2018-04-12 11:30 ` [PATCH 4/5] " Baolin Wang 2018-04-12 9:37 [4/5] " Vinod Koul 2018-04-12 9:37 ` [PATCH 4/5] " Vinod Koul 2018-04-11 12:13 [4/5] " Baolin Wang 2018-04-11 12:13 ` [PATCH 4/5] " Baolin Wang 2018-04-11 10:51 [5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Baolin Wang 2018-04-11 10:51 ` [PATCH 5/5] " Baolin Wang 2018-04-11 10:49 [1/5] dmaengine: sprd: Define the DMA transfer step type Baolin Wang 2018-04-11 10:49 ` [PATCH 1/5] " Baolin Wang 2018-04-11 9:36 [4/5] dmaengine: sprd: Add Spreadtrum DMA configuration Vinod Koul 2018-04-11 9:36 ` [PATCH 4/5] " Vinod Koul 2018-04-11 9:24 [1/5] dmaengine: sprd: Define the DMA transfer step type Vinod Koul 2018-04-11 9:24 ` [PATCH 1/5] " Vinod Koul 2018-04-10 7:46 [5/5] dmaengine: sprd: Add 'device_config' and 'device_prep_slave_sg' interfaces Baolin Wang 2018-04-10 7:46 ` [PATCH 5/5] " Baolin Wang 2018-04-10 7:46 [4/5] dmaengine: sprd: Add Spreadtrum DMA configuration Baolin Wang 2018-04-10 7:46 ` [PATCH 4/5] " Baolin Wang 2018-04-10 7:46 [3/5] dmaengine: sprd: Move DMA request mode and interrupt type into head file Baolin Wang 2018-04-10 7:46 ` [PATCH 3/5] " Baolin Wang 2018-04-10 7:46 [2/5] dmaengine: sprd: Define the DMA data width type Baolin Wang 2018-04-10 7:46 ` [PATCH 2/5] " Baolin Wang 2018-04-10 7:46 [1/5] dmaengine: sprd: Define the DMA transfer step type Baolin Wang 2018-04-10 7:46 ` [PATCH 1/5] " 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=20180411094000.GD6014@localhost \ --to=vinod.koul@intel.com \ --cc=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 \ /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.