From: Jonathan Cameron <jic23@kernel.org> To: Paul Cercueil <paul@crapouillou.net> Cc: "Lars-Peter Clausen" <lars@metafoo.de>, "Vinod Koul" <vkoul@kernel.org>, "Michael Hennerich" <Michael.Hennerich@analog.com>, "Nuno Sá" <noname.nuno@gmail.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com>, 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, "Alexandru Ardelean" <ardeleanalex@gmail.com> Subject: Re: [PATCH v3 05/11] iio: buffer-dmaengine: Support specifying buffer direction Date: Sun, 16 Apr 2023 15:35:46 +0100 [thread overview] Message-ID: <20230416153546.63290206@jic23-huawei> (raw) In-Reply-To: <20230403154800.215924-6-paul@crapouillou.net> On Mon, 3 Apr 2023 17:47:54 +0200 Paul Cercueil <paul@crapouillou.net> wrote: > Update the devm_iio_dmaengine_buffer_setup() function to support > specifying the buffer direction. > > Update the iio_dmaengine_buffer_submit() function to handle input > buffers as well as output buffers. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com> Just one trivial question inline. Jonathan > diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > index 5f85ba38e6f6..592d2aa9044c 100644 > --- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c > +++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > @@ -64,14 +64,25 @@ static int iio_dmaengine_buffer_submit_block(struct iio_dma_buffer_queue *queue, > struct dmaengine_buffer *dmaengine_buffer = > iio_buffer_to_dmaengine_buffer(&queue->buffer); > struct dma_async_tx_descriptor *desc; > + enum dma_transfer_direction dma_dir; > + size_t max_size; > dma_cookie_t cookie; > > - block->bytes_used = min(block->size, dmaengine_buffer->max_size); > - block->bytes_used = round_down(block->bytes_used, > - dmaengine_buffer->align); > + max_size = min(block->size, dmaengine_buffer->max_size); > + max_size = round_down(max_size, dmaengine_buffer->align); > + > + if (queue->buffer.direction == IIO_BUFFER_DIRECTION_IN) { > + block->bytes_used = max_size; > + dma_dir = DMA_DEV_TO_MEM; > + } else { > + dma_dir = DMA_MEM_TO_DEV; > + } > + > + if (!block->bytes_used || block->bytes_used > max_size) > + return -EINVAL; Two paths to here. Either DIRECTION_IN in which we just set things up so conditions being checked are always fine (unless max_size == 0? Can that happen?), or !DIRECTION_IN. So why not move this into the else {} branch above? > > desc = dmaengine_prep_slave_single(dmaengine_buffer->chan, > - block->phys_addr, block->bytes_used, DMA_DEV_TO_MEM, > + block->phys_addr, block->bytes_used, dma_dir, > DMA_PREP_INTERRUPT); > if (!desc) > return -ENOMEM;
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org> To: Paul Cercueil <paul@crapouillou.net> Cc: "Michael Hennerich" <Michael.Hennerich@analog.com>, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Sumit Semwal" <sumit.semwal@linaro.org>, linaro-mm-sig@lists.linaro.org, "Alexandru Ardelean" <ardeleanalex@gmail.com>, "Vinod Koul" <vkoul@kernel.org>, "Nuno Sá" <noname.nuno@gmail.com>, dmaengine@vger.kernel.org, "Christian König" <christian.koenig@amd.com>, linux-media@vger.kernel.org Subject: Re: [PATCH v3 05/11] iio: buffer-dmaengine: Support specifying buffer direction Date: Sun, 16 Apr 2023 15:35:46 +0100 [thread overview] Message-ID: <20230416153546.63290206@jic23-huawei> (raw) In-Reply-To: <20230403154800.215924-6-paul@crapouillou.net> On Mon, 3 Apr 2023 17:47:54 +0200 Paul Cercueil <paul@crapouillou.net> wrote: > Update the devm_iio_dmaengine_buffer_setup() function to support > specifying the buffer direction. > > Update the iio_dmaengine_buffer_submit() function to handle input > buffers as well as output buffers. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com> Just one trivial question inline. Jonathan > diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > index 5f85ba38e6f6..592d2aa9044c 100644 > --- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c > +++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c > @@ -64,14 +64,25 @@ static int iio_dmaengine_buffer_submit_block(struct iio_dma_buffer_queue *queue, > struct dmaengine_buffer *dmaengine_buffer = > iio_buffer_to_dmaengine_buffer(&queue->buffer); > struct dma_async_tx_descriptor *desc; > + enum dma_transfer_direction dma_dir; > + size_t max_size; > dma_cookie_t cookie; > > - block->bytes_used = min(block->size, dmaengine_buffer->max_size); > - block->bytes_used = round_down(block->bytes_used, > - dmaengine_buffer->align); > + max_size = min(block->size, dmaengine_buffer->max_size); > + max_size = round_down(max_size, dmaengine_buffer->align); > + > + if (queue->buffer.direction == IIO_BUFFER_DIRECTION_IN) { > + block->bytes_used = max_size; > + dma_dir = DMA_DEV_TO_MEM; > + } else { > + dma_dir = DMA_MEM_TO_DEV; > + } > + > + if (!block->bytes_used || block->bytes_used > max_size) > + return -EINVAL; Two paths to here. Either DIRECTION_IN in which we just set things up so conditions being checked are always fine (unless max_size == 0? Can that happen?), or !DIRECTION_IN. So why not move this into the else {} branch above? > > desc = dmaengine_prep_slave_single(dmaengine_buffer->chan, > - block->phys_addr, block->bytes_used, DMA_DEV_TO_MEM, > + block->phys_addr, block->bytes_used, dma_dir, > DMA_PREP_INTERRUPT); > if (!desc) > return -ENOMEM;
next prev parent reply other threads:[~2023-04-16 14:36 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-04-03 15:47 [PATCH v3 00/11] iio: new DMABUF based API, v3 Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-03 15:47 ` [PATCH v3 01/11] dmaengine: Add API function dmaengine_prep_slave_dma_array() Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-04 1:59 ` Hillf Danton 2023-04-04 7:42 ` Paul Cercueil 2023-04-04 7:42 ` Paul Cercueil 2023-04-04 8:54 ` Christian König 2023-04-04 8:54 ` Christian König 2023-04-12 17:23 ` Vinod Koul 2023-04-12 17:23 ` Vinod Koul 2023-04-13 7:59 ` Paul Cercueil 2023-04-13 7:59 ` Paul Cercueil 2023-04-03 15:47 ` [PATCH v3 02/11] dmaengine: dma-axi-dmac: Implement device_prep_slave_dma_array Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-03 15:47 ` [PATCH v3 03/11] iio: buffer-dma: Get rid of outgoing queue Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-16 14:24 ` Jonathan Cameron 2023-04-16 14:24 ` Jonathan Cameron 2023-04-18 8:08 ` Paul Cercueil 2023-04-18 8:08 ` Paul Cercueil 2023-05-01 16:25 ` Jonathan Cameron 2023-05-01 16:25 ` Jonathan Cameron 2023-04-03 15:47 ` [PATCH v3 04/11] iio: buffer-dma: Enable buffer write support Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-16 14:30 ` Jonathan Cameron 2023-04-16 14:30 ` Jonathan Cameron 2023-04-03 15:47 ` [PATCH v3 05/11] iio: buffer-dmaengine: Support specifying buffer direction Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-16 14:35 ` Jonathan Cameron [this message] 2023-04-16 14:35 ` Jonathan Cameron 2023-04-03 15:47 ` [PATCH v3 06/11] iio: buffer-dmaengine: Enable write support Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-16 14:37 ` Jonathan Cameron 2023-04-16 14:37 ` Jonathan Cameron 2023-04-03 15:47 ` [PATCH v3 07/11] iio: core: Add new DMABUF interface infrastructure Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-04 7:32 ` Nuno Sá 2023-04-04 7:55 ` Paul Cercueil 2023-04-04 8:21 ` Nuno Sá 2023-04-04 13:22 ` Lars-Peter Clausen 2023-04-16 15:04 ` Jonathan Cameron 2023-04-16 15:04 ` Jonathan Cameron 2023-04-03 15:47 ` [PATCH v3 08/11] iio: buffer-dma: split iio_dma_buffer_fileio_free() function Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-03 15:47 ` [PATCH v3 09/11] iio: buffer-dma: Enable support for DMABUFs Paul Cercueil 2023-04-03 15:47 ` Paul Cercueil 2023-04-16 15:10 ` Jonathan Cameron 2023-04-16 15:10 ` Jonathan Cameron 2023-04-03 15:49 ` [PATCH v3 10/11] iio: buffer-dmaengine: Support new DMABUF based userspace API Paul Cercueil 2023-04-03 15:49 ` Paul Cercueil 2023-04-03 15:49 ` [PATCH v3 11/11] Documentation: iio: Document high-speed DMABUF based API Paul Cercueil 2023-04-03 15:49 ` Paul Cercueil 2023-04-03 16:05 ` Jonathan Corbet 2023-04-03 16:05 ` Jonathan Corbet 2023-04-03 18:37 ` Paul Cercueil 2023-04-03 18:37 ` Paul Cercueil 2023-04-16 15:15 ` [PATCH v3 10/11] iio: buffer-dmaengine: Support new DMABUF based userspace API Jonathan Cameron 2023-04-16 15:15 ` Jonathan Cameron 2023-04-04 7:44 ` [PATCH v3 00/11] iio: new DMABUF based API, v3 Nuno Sá
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=20230416153546.63290206@jic23-huawei \ --to=jic23@kernel.org \ --cc=Michael.Hennerich@analog.com \ --cc=ardeleanalex@gmail.com \ --cc=christian.koenig@amd.com \ --cc=dmaengine@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=lars@metafoo.de \ --cc=linaro-mm-sig@lists.linaro.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=noname.nuno@gmail.com \ --cc=paul@crapouillou.net \ --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.