From: Paul Cercueil <paul@crapouillou.net> To: "Jonathan Cameron" <jic23@kernel.org>, "Jonathan Corbet" <corbet@lwn.net>, "Lars-Peter Clausen" <lars@metafoo.de>, "Vinod Koul" <vkoul@kernel.org>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com> Cc: Paul Cercueil <paul@crapouillou.net>, Michael Hennerich <Michael.Hennerich@analog.com>, linux-doc@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Nuno Sa <nuno.sa@analog.com>, linaro-mm-sig@lists.linaro.org, Daniel Vetter <daniel@ffwll.ch>, dmaengine@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v6 2/6] dmaengine: dma-axi-dmac: Implement device_prep_slave_dma_vec Date: Mon, 29 Jan 2024 18:01:57 +0100 [thread overview] Message-ID: <20240129170201.133785-3-paul@crapouillou.net> (raw) In-Reply-To: <20240129170201.133785-1-paul@crapouillou.net> Add implementation of the .device_prep_slave_dma_vec() callback. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- v3: New patch v5: Implement .device_prep_slave_dma_vec() instead of v3's .device_prep_slave_dma_array(). v6: Use new prototype for axi_dmac_alloc_desc() as it changed upstream. --- drivers/dma/dma-axi-dmac.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c index 4e339c04fc1e..276856a1742d 100644 --- a/drivers/dma/dma-axi-dmac.c +++ b/drivers/dma/dma-axi-dmac.c @@ -620,6 +620,45 @@ static struct axi_dmac_sg *axi_dmac_fill_linear_sg(struct axi_dmac_chan *chan, return sg; } +static struct dma_async_tx_descriptor * +axi_dmac_prep_slave_dma_vec(struct dma_chan *c, const struct dma_vec *vecs, + size_t nb, enum dma_transfer_direction direction, + unsigned long flags) +{ + struct axi_dmac_chan *chan = to_axi_dmac_chan(c); + struct axi_dmac_desc *desc; + unsigned int num_sgs = 0; + struct axi_dmac_sg *dsg; + size_t i; + + if (direction != chan->direction) + return NULL; + + for (i = 0; i < nb; i++) + num_sgs += DIV_ROUND_UP(vecs[i].len, chan->max_length); + + desc = axi_dmac_alloc_desc(chan, num_sgs); + if (!desc) + return NULL; + + dsg = desc->sg; + + for (i = 0; i < nb; i++) { + if (!axi_dmac_check_addr(chan, vecs[i].addr) || + !axi_dmac_check_len(chan, vecs[i].len)) { + kfree(desc); + return NULL; + } + + dsg = axi_dmac_fill_linear_sg(chan, direction, vecs[i].addr, 1, + vecs[i].len, dsg); + } + + desc->cyclic = false; + + return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); +} + static struct dma_async_tx_descriptor *axi_dmac_prep_slave_sg( struct dma_chan *c, struct scatterlist *sgl, unsigned int sg_len, enum dma_transfer_direction direction, @@ -1055,6 +1094,7 @@ static int axi_dmac_probe(struct platform_device *pdev) dma_dev->device_tx_status = dma_cookie_status; dma_dev->device_issue_pending = axi_dmac_issue_pending; dma_dev->device_prep_slave_sg = axi_dmac_prep_slave_sg; + dma_dev->device_prep_slave_dma_vec = axi_dmac_prep_slave_dma_vec; dma_dev->device_prep_dma_cyclic = axi_dmac_prep_dma_cyclic; dma_dev->device_prep_interleaved_dma = axi_dmac_prep_interleaved; dma_dev->device_terminate_all = axi_dmac_terminate_all; -- 2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: "Jonathan Cameron" <jic23@kernel.org>, "Jonathan Corbet" <corbet@lwn.net>, "Lars-Peter Clausen" <lars@metafoo.de>, "Vinod Koul" <vkoul@kernel.org>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com> Cc: Daniel Vetter <daniel@ffwll.ch>, Nuno Sa <nuno.sa@analog.com>, Michael Hennerich <Michael.Hennerich@analog.com>, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-iio@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Paul Cercueil <paul@crapouillou.net> Subject: [PATCH v6 2/6] dmaengine: dma-axi-dmac: Implement device_prep_slave_dma_vec Date: Mon, 29 Jan 2024 18:01:57 +0100 [thread overview] Message-ID: <20240129170201.133785-3-paul@crapouillou.net> (raw) In-Reply-To: <20240129170201.133785-1-paul@crapouillou.net> Add implementation of the .device_prep_slave_dma_vec() callback. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- v3: New patch v5: Implement .device_prep_slave_dma_vec() instead of v3's .device_prep_slave_dma_array(). v6: Use new prototype for axi_dmac_alloc_desc() as it changed upstream. --- drivers/dma/dma-axi-dmac.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c index 4e339c04fc1e..276856a1742d 100644 --- a/drivers/dma/dma-axi-dmac.c +++ b/drivers/dma/dma-axi-dmac.c @@ -620,6 +620,45 @@ static struct axi_dmac_sg *axi_dmac_fill_linear_sg(struct axi_dmac_chan *chan, return sg; } +static struct dma_async_tx_descriptor * +axi_dmac_prep_slave_dma_vec(struct dma_chan *c, const struct dma_vec *vecs, + size_t nb, enum dma_transfer_direction direction, + unsigned long flags) +{ + struct axi_dmac_chan *chan = to_axi_dmac_chan(c); + struct axi_dmac_desc *desc; + unsigned int num_sgs = 0; + struct axi_dmac_sg *dsg; + size_t i; + + if (direction != chan->direction) + return NULL; + + for (i = 0; i < nb; i++) + num_sgs += DIV_ROUND_UP(vecs[i].len, chan->max_length); + + desc = axi_dmac_alloc_desc(chan, num_sgs); + if (!desc) + return NULL; + + dsg = desc->sg; + + for (i = 0; i < nb; i++) { + if (!axi_dmac_check_addr(chan, vecs[i].addr) || + !axi_dmac_check_len(chan, vecs[i].len)) { + kfree(desc); + return NULL; + } + + dsg = axi_dmac_fill_linear_sg(chan, direction, vecs[i].addr, 1, + vecs[i].len, dsg); + } + + desc->cyclic = false; + + return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); +} + static struct dma_async_tx_descriptor *axi_dmac_prep_slave_sg( struct dma_chan *c, struct scatterlist *sgl, unsigned int sg_len, enum dma_transfer_direction direction, @@ -1055,6 +1094,7 @@ static int axi_dmac_probe(struct platform_device *pdev) dma_dev->device_tx_status = dma_cookie_status; dma_dev->device_issue_pending = axi_dmac_issue_pending; dma_dev->device_prep_slave_sg = axi_dmac_prep_slave_sg; + dma_dev->device_prep_slave_dma_vec = axi_dmac_prep_slave_dma_vec; dma_dev->device_prep_dma_cyclic = axi_dmac_prep_dma_cyclic; dma_dev->device_prep_interleaved_dma = axi_dmac_prep_interleaved; dma_dev->device_terminate_all = axi_dmac_terminate_all; -- 2.43.0
next prev parent reply other threads:[~2024-01-29 17:02 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-29 17:01 [PATCH v6 0/6] iio: new DMABUF based API, v6 Paul Cercueil 2024-01-29 17:01 ` Paul Cercueil 2024-01-29 17:01 ` [PATCH v6 1/6] dmaengine: Add API function dmaengine_prep_slave_dma_vec() Paul Cercueil 2024-01-29 17:01 ` Paul Cercueil 2024-01-30 16:08 ` Vinod Koul 2024-01-30 16:08 ` Vinod Koul 2024-01-30 17:23 ` Paul Cercueil 2024-01-30 17:23 ` Paul Cercueil 2024-01-29 17:01 ` Paul Cercueil [this message] 2024-01-29 17:01 ` [PATCH v6 2/6] dmaengine: dma-axi-dmac: Implement device_prep_slave_dma_vec Paul Cercueil 2024-01-29 17:01 ` [PATCH v6 3/6] iio: core: Add new DMABUF interface infrastructure Paul Cercueil 2024-01-29 17:01 ` Paul Cercueil 2024-01-29 17:01 ` [PATCH v6 4/6] iio: buffer-dma: Enable support for DMABUFs Paul Cercueil 2024-01-29 17:01 ` Paul Cercueil 2024-01-29 17:02 ` [PATCH v6 5/6] iio: buffer-dmaengine: Support new DMABUF based userspace API Paul Cercueil 2024-01-29 17:02 ` Paul Cercueil 2024-01-29 17:02 ` [PATCH v6 6/6] Documentation: iio: Document high-speed DMABUF based API Paul Cercueil 2024-01-29 17:02 ` Paul Cercueil
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=20240129170201.133785-3-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=Michael.Hennerich@analog.com \ --cc=christian.koenig@amd.com \ --cc=corbet@lwn.net \ --cc=daniel@ffwll.ch \ --cc=dmaengine@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=jic23@kernel.org \ --cc=lars@metafoo.de \ --cc=linaro-mm-sig@lists.linaro.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=nuno.sa@analog.com \ --cc=sumit.semwal@linaro.org \ --cc=vkoul@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.