From: David Lechner <dlechner@baylibre.com>
To: "Mark Brown" <broonie@kernel.org>,
"Jonathan Cameron" <jic23@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Michael Hennerich" <michael.hennerich@analog.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Frank Rowand" <frowand.list@gmail.com>
Cc: "David Lechner" <dlechner@baylibre.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Jonathan Corbet" <corbet@lwn.net>,
linux-spi@vger.kernel.org, linux-iio@vger.kernel.org,
devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/13] iio: buffer: add hardware triggered buffer support
Date: Wed, 10 Jan 2024 13:49:47 -0600 [thread overview]
Message-ID: <20240109-axi-spi-engine-series-3-v1-6-e42c6a986580@baylibre.com> (raw)
In-Reply-To: <20240109-axi-spi-engine-series-3-v1-0-e42c6a986580@baylibre.com>
This adds a new mode INDIO_HW_BUFFER_TRIGGERED to the IIO subsystem.
This mode is essentially the hardware version of INDIO_BUFFER_TRIGGERED
where the trigger has the semantics of INDIO_HARDWARE_TRIGGERED and the
buffer has the semantics of INDIO_BUFFER_HARDWARE.
So basically INDIO_HW_BUFFER_TRIGGERED is the same as
INDIO_BUFFER_HARDWARE except that it also enables the trigger when the
buffer is enabled.
Signed-off-by: David Lechner <dlechner@baylibre.com>
---
drivers/iio/industrialio-buffer.c | 43 ++++++++++++++++++++++++++++++++++++---
include/linux/iio/iio.h | 16 ++++++++++++---
2 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 176d31d9f9d8..ffee3043c65a 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -27,6 +27,7 @@
#include <linux/iio/sysfs.h>
#include <linux/iio/buffer.h>
#include <linux/iio/buffer_impl.h>
+#include <linux/iio/trigger.h>
static const char * const iio_endian_prefix[] = {
[IIO_BE] = "be",
@@ -867,8 +868,17 @@ static int iio_verify_update(struct iio_dev *indio_dev,
insert_buffer->watermark);
}
- /* Definitely possible for devices to support both of these. */
- if ((modes & INDIO_BUFFER_TRIGGERED) && indio_dev->trig) {
+ /* Definitely possible for devices to support all of these. */
+ if (modes & INDIO_HW_BUFFER_TRIGGERED) {
+ /*
+ * Keep things simple for now and only allow a single buffer to
+ * be connected in hardware mode.
+ */
+ if (insert_buffer && !list_empty(&iio_dev_opaque->buffer_list))
+ return -EINVAL;
+ config->mode = INDIO_HW_BUFFER_TRIGGERED;
+ strict_scanmask = true;
+ } else if ((modes & INDIO_BUFFER_TRIGGERED) && indio_dev->trig) {
config->mode = INDIO_BUFFER_TRIGGERED;
} else if (modes & INDIO_BUFFER_HARDWARE) {
/*
@@ -1107,11 +1117,21 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
}
}
+ if (iio_dev_opaque->currentmode == INDIO_HW_BUFFER_TRIGGERED) {
+ struct iio_trigger *trig = indio_dev->trig;
+
+ if (trig->ops && trig->ops->set_trigger_state) {
+ ret = trig->ops->set_trigger_state(trig, true);
+ if (ret)
+ goto err_disable_buffers;
+ }
+ }
+
if (iio_dev_opaque->currentmode == INDIO_BUFFER_TRIGGERED) {
ret = iio_trigger_attach_poll_func(indio_dev->trig,
indio_dev->pollfunc);
if (ret)
- goto err_disable_buffers;
+ goto err_disable_hw_trigger;
}
if (indio_dev->setup_ops->postenable) {
@@ -1130,6 +1150,16 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
iio_trigger_detach_poll_func(indio_dev->trig,
indio_dev->pollfunc);
}
+err_disable_hw_trigger:
+ if (iio_dev_opaque->currentmode == INDIO_HW_BUFFER_TRIGGERED) {
+ struct iio_trigger *trig = indio_dev->trig;
+
+ if (trig->ops && trig->ops->set_trigger_state) {
+ ret = trig->ops->set_trigger_state(trig, false);
+ if (ret)
+ return ret;
+ }
+ }
err_disable_buffers:
buffer = list_prepare_entry(tmp, &iio_dev_opaque->buffer_list, buffer_list);
list_for_each_entry_continue_reverse(buffer, &iio_dev_opaque->buffer_list,
@@ -1174,6 +1204,13 @@ static int iio_disable_buffers(struct iio_dev *indio_dev)
indio_dev->pollfunc);
}
+ if (iio_dev_opaque->currentmode == INDIO_HW_BUFFER_TRIGGERED) {
+ struct iio_trigger *trig = indio_dev->trig;
+
+ if (trig->ops && trig->ops->set_trigger_state)
+ trig->ops->set_trigger_state(trig, false);
+ }
+
list_for_each_entry(buffer, &iio_dev_opaque->buffer_list, buffer_list) {
ret2 = iio_buffer_disable(buffer, indio_dev);
if (ret2 && !ret)
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index d0ce3b71106a..16f62bd38041 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -366,6 +366,11 @@ s64 iio_get_time_ns(const struct iio_dev *indio_dev);
* they must be managed by the core, but without the entire interrupts/poll
* functions burden. Interrupts are irrelevant as the data flow is hardware
* mediated and distributed.
+ * @INDIO_HW_BUFFER_TRIGGERED: Very unusual mode.
+ * This is similar to INDIO_BUFFER_TRIGGERED but everything is done in hardware
+ * therefore there are no poll functions attached. It also implies the semantics
+ * of both INDIO_HARDWARE_TRIGGERED for the trigger and INDIO_BUFFER_HARDWARE
+ * for the buffer.
*/
#define INDIO_DIRECT_MODE 0x01
#define INDIO_BUFFER_TRIGGERED 0x02
@@ -373,14 +378,19 @@ s64 iio_get_time_ns(const struct iio_dev *indio_dev);
#define INDIO_BUFFER_HARDWARE 0x08
#define INDIO_EVENT_TRIGGERED 0x10
#define INDIO_HARDWARE_TRIGGERED 0x20
+#define INDIO_HW_BUFFER_TRIGGERED 0x40
-#define INDIO_ALL_BUFFER_MODES \
- (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE | INDIO_BUFFER_SOFTWARE)
+#define INDIO_ALL_BUFFER_MODES \
+ (INDIO_BUFFER_TRIGGERED \
+ | INDIO_BUFFER_HARDWARE \
+ | INDIO_BUFFER_SOFTWARE \
+ | INDIO_HW_BUFFER_TRIGGERED)
#define INDIO_ALL_TRIGGERED_MODES \
(INDIO_BUFFER_TRIGGERED \
| INDIO_EVENT_TRIGGERED \
- | INDIO_HARDWARE_TRIGGERED)
+ | INDIO_HARDWARE_TRIGGERED \
+ | INDIO_HW_BUFFER_TRIGGERED)
#define INDIO_MAX_RAW_ELEMENTS 4
--
2.43.0
next prev parent reply other threads:[~2024-01-10 19:51 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 19:49 [PATCH 00/13] spi: axi-spi-engine: add offload support David Lechner
2024-01-10 19:49 ` [PATCH 01/13] spi: add core support for controllers with offload capabilities David Lechner
2024-01-10 21:36 ` Mark Brown
2024-01-11 20:54 ` David Lechner
2024-01-11 21:32 ` David Lechner
2024-01-11 21:49 ` Mark Brown
2024-01-12 9:03 ` David Jander
2024-01-12 20:09 ` David Lechner
2024-03-04 23:21 ` David Lechner
2024-03-05 18:50 ` Mark Brown
2024-03-09 17:54 ` Jonathan Cameron
2024-01-11 8:49 ` Nuno Sá
2024-01-11 13:33 ` Mark Brown
2024-01-11 14:11 ` Nuno Sá
2024-01-11 15:41 ` Mark Brown
2024-01-12 7:26 ` Nuno Sá
2024-01-10 19:49 ` [PATCH 02/13] scripts: dtc: checks: don't warn on SPI non-peripheral child nodes David Lechner
2024-01-11 22:03 ` Rob Herring
2024-01-10 19:49 ` [PATCH 03/13] spi: do not attempt to register DT nodes without @ in name David Lechner
2024-01-10 21:37 ` Mark Brown
2024-01-10 19:49 ` [PATCH 04/13] spi: dt-bindings: adi,axi-spi-engine: add offload bindings David Lechner
2024-01-10 23:14 ` Rob Herring
2024-01-11 0:06 ` David Lechner
2024-01-11 9:14 ` Nuno Sá
2024-01-11 9:07 ` Nuno Sá
2024-01-10 19:49 ` [PATCH 05/13] spi: axi-spi-engine: add SPI offload support David Lechner
2024-01-10 21:39 ` Mark Brown
2024-01-10 22:31 ` David Lechner
2024-01-11 13:00 ` Mark Brown
2024-01-11 17:57 ` David Lechner
2024-01-10 19:49 ` David Lechner [this message]
2024-01-12 12:37 ` [PATCH 06/13] iio: buffer: add hardware triggered buffer support Jonathan Cameron
2024-01-12 15:42 ` David Lechner
2024-01-12 16:50 ` Nuno Sá
2024-01-10 19:49 ` [PATCH 07/13] iio: buffer: dmaengine: add INDIO_HW_BUFFER_TRIGGERED flag David Lechner
2024-01-10 19:49 ` [PATCH 08/13] iio: buffer: add new hardware triggered buffer driver David Lechner
2024-01-11 9:24 ` Nuno Sá
2024-01-10 19:49 ` [PATCH 09/13] bus: auxiliary: increase AUXILIARY_NAME_SIZE David Lechner
2024-01-10 19:49 ` [PATCH 10/13] iio: buffer: dmaengine: export devm_iio_dmaengine_buffer_alloc() David Lechner
2024-01-12 12:37 ` Jonathan Cameron
2024-01-12 14:55 ` David Lechner
2024-01-10 19:49 ` [PATCH 11/13] dt-bindings: iio: offload: add binding for PWM/DMA triggered buffer David Lechner
2024-01-10 21:25 ` Rob Herring
2024-01-10 22:56 ` Rob Herring
2024-01-10 19:49 ` [PATCH 12/13] iio: offload: add new PWM triggered DMA buffer driver David Lechner
2024-01-11 9:31 ` Nuno Sá
2024-01-11 14:59 ` Nuno Sá
2024-01-12 12:51 ` Jonathan Cameron
2024-01-12 13:19 ` Nuno Sá
2024-01-12 12:45 ` Jonathan Cameron
2024-01-10 19:49 ` [PATCH 13/13] iio: adc: ad7380: add SPI offload support David Lechner
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=20240109-axi-spi-engine-series-3-v1-6-e42c6a986580@baylibre.com \
--to=dlechner@baylibre.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=jic23@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=nuno.sa@analog.com \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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).