From: Paul Cercueil <paul@crapouillou.net> To: Jonathan Cameron <jic23@kernel.org> Cc: "Paul Cercueil" <paul@crapouillou.net>, "Michael Hennerich" <Michael.Hennerich@analog.com>, "Jonathan Corbet" <corbet@lwn.net>, linux-iio@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, "Alexandru Ardelean" <ardeleanalex@gmail.com>, "Alexandru Ardelean" <alexandru.ardelean@analog.com>, "Christian König" <christian.koenig@amd.com> Subject: [PATCH v2 06/12] iio: buffer-dma: split iio_dma_buffer_fileio_free() function Date: Mon, 7 Feb 2022 12:59:27 +0000 [thread overview] Message-ID: <20220207125933.81634-7-paul@crapouillou.net> (raw) In-Reply-To: <20220207125933.81634-1-paul@crapouillou.net> From: Alexandru Ardelean <alexandru.ardelean@analog.com> A part of the logic in the iio_dma_buffer_exit() is required for the change to add mmap support to IIO buffers. This change splits the logic into a separate function, which will be re-used later. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Cc: Alexandru Ardelean <ardeleanalex@gmail.com> Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/iio/buffer/industrialio-buffer-dma.c | 43 +++++++++++--------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c index a9f1b673374f..15ea7bc3ac08 100644 --- a/drivers/iio/buffer/industrialio-buffer-dma.c +++ b/drivers/iio/buffer/industrialio-buffer-dma.c @@ -374,6 +374,29 @@ int iio_dma_buffer_request_update(struct iio_buffer *buffer) } EXPORT_SYMBOL_GPL(iio_dma_buffer_request_update); +static void iio_dma_buffer_fileio_free(struct iio_dma_buffer_queue *queue) +{ + unsigned int i; + + spin_lock_irq(&queue->list_lock); + for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { + if (!queue->fileio.blocks[i]) + continue; + queue->fileio.blocks[i]->state = IIO_BLOCK_STATE_DEAD; + } + spin_unlock_irq(&queue->list_lock); + + INIT_LIST_HEAD(&queue->incoming); + + for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { + if (!queue->fileio.blocks[i]) + continue; + iio_buffer_block_put(queue->fileio.blocks[i]); + queue->fileio.blocks[i] = NULL; + } + queue->fileio.active_block = NULL; +} + static void iio_dma_buffer_submit_block(struct iio_dma_buffer_queue *queue, struct iio_dma_buffer_block *block) { @@ -694,27 +717,9 @@ EXPORT_SYMBOL_GPL(iio_dma_buffer_init); */ void iio_dma_buffer_exit(struct iio_dma_buffer_queue *queue) { - unsigned int i; - mutex_lock(&queue->lock); - spin_lock_irq(&queue->list_lock); - for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { - if (!queue->fileio.blocks[i]) - continue; - queue->fileio.blocks[i]->state = IIO_BLOCK_STATE_DEAD; - } - spin_unlock_irq(&queue->list_lock); - - INIT_LIST_HEAD(&queue->incoming); - - for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { - if (!queue->fileio.blocks[i]) - continue; - iio_buffer_block_put(queue->fileio.blocks[i]); - queue->fileio.blocks[i] = NULL; - } - queue->fileio.active_block = NULL; + iio_dma_buffer_fileio_free(queue); queue->ops = NULL; mutex_unlock(&queue->lock); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: Jonathan Cameron <jic23@kernel.org> Cc: "Michael Hennerich" <Michael.Hennerich@analog.com>, "Lars-Peter Clausen" <lars@metafoo.de>, "Christian König" <christian.koenig@amd.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Jonathan Corbet" <corbet@lwn.net>, "Alexandru Ardelean" <ardeleanalex@gmail.com>, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, "Alexandru Ardelean" <alexandru.ardelean@analog.com>, "Paul Cercueil" <paul@crapouillou.net> Subject: [PATCH v2 06/12] iio: buffer-dma: split iio_dma_buffer_fileio_free() function Date: Mon, 7 Feb 2022 12:59:27 +0000 [thread overview] Message-ID: <20220207125933.81634-7-paul@crapouillou.net> (raw) In-Reply-To: <20220207125933.81634-1-paul@crapouillou.net> From: Alexandru Ardelean <alexandru.ardelean@analog.com> A part of the logic in the iio_dma_buffer_exit() is required for the change to add mmap support to IIO buffers. This change splits the logic into a separate function, which will be re-used later. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Cc: Alexandru Ardelean <ardeleanalex@gmail.com> Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/iio/buffer/industrialio-buffer-dma.c | 43 +++++++++++--------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c index a9f1b673374f..15ea7bc3ac08 100644 --- a/drivers/iio/buffer/industrialio-buffer-dma.c +++ b/drivers/iio/buffer/industrialio-buffer-dma.c @@ -374,6 +374,29 @@ int iio_dma_buffer_request_update(struct iio_buffer *buffer) } EXPORT_SYMBOL_GPL(iio_dma_buffer_request_update); +static void iio_dma_buffer_fileio_free(struct iio_dma_buffer_queue *queue) +{ + unsigned int i; + + spin_lock_irq(&queue->list_lock); + for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { + if (!queue->fileio.blocks[i]) + continue; + queue->fileio.blocks[i]->state = IIO_BLOCK_STATE_DEAD; + } + spin_unlock_irq(&queue->list_lock); + + INIT_LIST_HEAD(&queue->incoming); + + for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { + if (!queue->fileio.blocks[i]) + continue; + iio_buffer_block_put(queue->fileio.blocks[i]); + queue->fileio.blocks[i] = NULL; + } + queue->fileio.active_block = NULL; +} + static void iio_dma_buffer_submit_block(struct iio_dma_buffer_queue *queue, struct iio_dma_buffer_block *block) { @@ -694,27 +717,9 @@ EXPORT_SYMBOL_GPL(iio_dma_buffer_init); */ void iio_dma_buffer_exit(struct iio_dma_buffer_queue *queue) { - unsigned int i; - mutex_lock(&queue->lock); - spin_lock_irq(&queue->list_lock); - for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { - if (!queue->fileio.blocks[i]) - continue; - queue->fileio.blocks[i]->state = IIO_BLOCK_STATE_DEAD; - } - spin_unlock_irq(&queue->list_lock); - - INIT_LIST_HEAD(&queue->incoming); - - for (i = 0; i < ARRAY_SIZE(queue->fileio.blocks); i++) { - if (!queue->fileio.blocks[i]) - continue; - iio_buffer_block_put(queue->fileio.blocks[i]); - queue->fileio.blocks[i] = NULL; - } - queue->fileio.active_block = NULL; + iio_dma_buffer_fileio_free(queue); queue->ops = NULL; mutex_unlock(&queue->lock); -- 2.34.1
next prev parent reply other threads:[~2022-02-07 13:00 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-07 12:59 [PATCH v2 00/12] iio: buffer-dma: write() and new DMABUF based API Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-07 12:59 ` [PATCH v2 01/12] iio: buffer-dma: Get rid of outgoing queue Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-13 18:57 ` Jonathan Cameron 2022-02-13 18:57 ` Jonathan Cameron 2022-02-13 19:25 ` Paul Cercueil 2022-02-13 19:25 ` Paul Cercueil 2022-03-28 17:17 ` Jonathan Cameron 2022-03-28 17:17 ` Jonathan Cameron 2022-02-07 12:59 ` [PATCH v2 02/12] iio: buffer-dma: Enable buffer write support Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-03-28 17:24 ` Jonathan Cameron 2022-03-28 17:24 ` Jonathan Cameron 2022-03-28 18:39 ` Paul Cercueil 2022-03-28 18:39 ` Paul Cercueil 2022-03-29 7:11 ` Nuno Sá 2022-03-29 7:11 ` Nuno Sá 2022-03-28 20:38 ` Andy Shevchenko 2022-03-28 20:38 ` Andy Shevchenko 2022-02-07 12:59 ` [PATCH v2 03/12] iio: buffer-dmaengine: Support specifying buffer direction Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-07 12:59 ` [PATCH v2 04/12] iio: buffer-dmaengine: Enable write support Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-03-28 17:28 ` Jonathan Cameron 2022-03-28 17:28 ` Jonathan Cameron 2022-02-07 12:59 ` [PATCH v2 05/12] iio: core: Add new DMABUF interface infrastructure Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-03-28 17:37 ` Jonathan Cameron 2022-03-28 17:37 ` Jonathan Cameron 2022-03-28 18:44 ` Paul Cercueil 2022-03-28 18:44 ` Paul Cercueil 2022-03-29 13:36 ` Jonathan Cameron 2022-03-29 13:36 ` Jonathan Cameron 2022-03-28 20:46 ` Andy Shevchenko 2022-03-28 20:46 ` Andy Shevchenko 2022-02-07 12:59 ` Paul Cercueil [this message] 2022-02-07 12:59 ` [PATCH v2 06/12] iio: buffer-dma: split iio_dma_buffer_fileio_free() function Paul Cercueil 2022-02-07 12:59 ` [PATCH v2 07/12] iio: buffer-dma: Use DMABUFs instead of custom solution Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-03-28 17:54 ` Jonathan Cameron 2022-03-28 17:54 ` Jonathan Cameron 2022-03-28 17:54 ` Christian König 2022-03-28 17:54 ` Christian König 2022-03-28 19:16 ` Paul Cercueil 2022-03-28 19:16 ` Paul Cercueil 2022-03-28 20:58 ` Andy Shevchenko 2022-03-28 20:58 ` Andy Shevchenko 2022-02-07 12:59 ` [PATCH v2 08/12] iio: buffer-dma: Implement new DMABUF based userspace API Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-07 12:59 ` [PATCH v2 09/12] iio: buffer-dmaengine: Support " Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-07 12:59 ` [PATCH v2 10/12] iio: core: Add support for cyclic buffers Paul Cercueil 2022-02-07 12:59 ` Paul Cercueil 2022-02-07 13:01 ` [PATCH v2 11/12] iio: buffer-dmaengine: " Paul Cercueil 2022-02-07 13:01 ` Paul Cercueil 2022-02-07 13:01 ` [PATCH v2 12/12] Documentation: iio: Document high-speed DMABUF based API Paul Cercueil 2022-02-07 13:01 ` Paul Cercueil 2022-03-29 8:54 ` Daniel Vetter 2022-03-29 8:54 ` Daniel Vetter 2022-03-29 9:47 ` Paul Cercueil 2022-03-29 9:47 ` Paul Cercueil 2022-03-29 14:07 ` Daniel Vetter 2022-03-29 14:07 ` Daniel Vetter 2022-03-29 17:34 ` Paul Cercueil 2022-03-29 17:34 ` Paul Cercueil 2022-03-30 9:22 ` Daniel Vetter 2022-03-30 9:22 ` Daniel Vetter 2022-02-13 18:46 ` [PATCH v2 00/12] iio: buffer-dma: write() and new " Jonathan Cameron 2022-02-13 18:46 ` Jonathan Cameron 2022-02-15 17:43 ` Paul Cercueil 2022-02-15 17:43 ` Paul Cercueil 2022-03-29 8:33 ` Daniel Vetter 2022-03-29 8:33 ` Daniel Vetter 2022-03-29 9:11 ` Paul Cercueil 2022-03-29 9:11 ` Paul Cercueil 2022-03-29 14:10 ` Daniel Vetter 2022-03-29 14:10 ` Daniel Vetter 2022-03-29 17:16 ` Paul Cercueil 2022-03-29 17:16 ` Paul Cercueil 2022-03-30 9:19 ` Daniel Vetter 2022-03-30 9:19 ` Daniel Vetter
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=20220207125933.81634-7-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=Michael.Hennerich@analog.com \ --cc=alexandru.ardelean@analog.com \ --cc=ardeleanalex@gmail.com \ --cc=christian.koenig@amd.com \ --cc=corbet@lwn.net \ --cc=dri-devel@lists.freedesktop.org \ --cc=jic23@kernel.org \ --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 \ /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.