From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Francesco Lavra <flavra@baylibre.com>
Cc: "Jonathan Cameron" <jic23@kernel.org>,
"David Lechner" <dlechner@baylibre.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Andy Shevchenko" <andy@kernel.org>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/9] iio: imu: st_lsm6dsx: make event_settings more generic
Date: Thu, 30 Oct 2025 17:44:25 +0100 [thread overview]
Message-ID: <aQOV6cDVTJ-5uyCz@lore-desk> (raw)
In-Reply-To: <20251030072752.349633-3-flavra@baylibre.com>
[-- Attachment #1: Type: text/plain, Size: 9521 bytes --]
On Oct 30, Francesco Lavra wrote:
> The st_lsm6dsx_event_settings structure contains fields specific
> for one event type (wakeup). In preparation for adding support for
> more event types, introduce an event id enum and a generic event
> source structure, and replace wakeup-specific data in struct
> st_lsm6dsx_event_settings with an array of event source structures.
>
> Signed-off-by: Francesco Lavra <flavra@baylibre.com>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 21 ++-
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 136 +++++++++++--------
> 2 files changed, 96 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index db863bd1898d..05689887f7ec 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -221,14 +221,23 @@ struct st_lsm6dsx_shub_settings {
> u8 pause;
> };
>
> +enum st_lsm6dsx_event_id {
> + ST_LSM6DSX_EVENT_WAKEUP,
> + ST_LSM6DSX_EVENT_MAX
> +};
> +
> +struct st_lsm6dsx_event_src {
> + struct st_lsm6dsx_reg value;
> + u8 status_reg;
> + u8 status_mask;
> + u8 status_x_mask;
> + u8 status_y_mask;
> + u8 status_z_mask;
you can use st_lsm6dsx_reg here.
> +};
> +
> struct st_lsm6dsx_event_settings {
> struct st_lsm6dsx_reg enable_reg;
> - struct st_lsm6dsx_reg wakeup_reg;
> - u8 wakeup_src_reg;
> - u8 wakeup_src_status_mask;
> - u8 wakeup_src_z_mask;
> - u8 wakeup_src_y_mask;
> - u8 wakeup_src_x_mask;
> + struct st_lsm6dsx_event_src sources[ST_LSM6DSX_EVENT_MAX];
> };
>
> enum st_lsm6dsx_ext_sensor_id {
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 17b46e15cce5..bb4c4c531128 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -350,15 +350,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> },
> },
> .event_settings = {
> - .wakeup_reg = {
> - .addr = 0x5B,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x1b,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x1b,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -510,15 +514,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> },
> },
> .event_settings = {
> - .wakeup_reg = {
> - .addr = 0x5B,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x1b,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x1b,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -741,15 +749,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x58,
> .mask = BIT(7),
> },
> - .wakeup_reg = {
> - .addr = 0x5B,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x1b,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x1b,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -972,15 +984,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x58,
> .mask = BIT(7),
> },
> - .wakeup_reg = {
> - .addr = 0x5b,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x1b,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x1b,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -1147,15 +1163,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x58,
> .mask = BIT(7),
> },
> - .wakeup_reg = {
> - .addr = 0x5B,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x1b,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x1b,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -1347,15 +1367,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x50,
> .mask = BIT(7),
> },
> - .wakeup_reg = {
> - .addr = 0x5b,
> - .mask = GENMASK(5, 0),
> + .sources = {
> + [ST_LSM6DSX_EVENT_WAKEUP] = {
> + .value = {
> + .addr = 0x5b,
> + .mask = GENMASK(5, 0),
> + },
> + .status_reg = 0x45,
> + .status_mask = BIT(3),
> + .status_z_mask = BIT(0),
> + .status_y_mask = BIT(1),
> + .status_x_mask = BIT(2),
> + },
> },
> - .wakeup_src_reg = 0x45,
> - .wakeup_src_status_mask = BIT(3),
> - .wakeup_src_z_mask = BIT(0),
> - .wakeup_src_y_mask = BIT(1),
> - .wakeup_src_x_mask = BIT(2),
> },
> },
> {
> @@ -1861,7 +1885,7 @@ st_lsm6dsx_write_event(struct iio_dev *iio_dev,
> if (val < 0 || val > 31)
> return -EINVAL;
>
> - reg = &hw->settings->event_settings.wakeup_reg;
> + reg = &hw->settings->event_settings.sources[ST_LSM6DSX_EVENT_WAKEUP].value;
> data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> err = st_lsm6dsx_update_bits_locked(hw, reg->addr,
> reg->mask, data);
> @@ -2318,7 +2342,7 @@ static int st_lsm6dsx_chan_init(struct iio_chan_spec *channels, struct st_lsm6ds
> chan->scan_type.endianness = IIO_LE;
> chan->ext_info = st_lsm6dsx_ext_info;
> if (id == ST_LSM6DSX_ID_ACC) {
> - if (hw->settings->event_settings.wakeup_reg.addr) {
> + if (hw->settings->event_settings.sources[ST_LSM6DSX_EVENT_WAKEUP].value.addr) {
> chan->event_spec = &st_lsm6dsx_event;
> chan->num_event_specs = 1;
> }
> @@ -2389,6 +2413,7 @@ static bool
> st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
> {
> const struct st_lsm6dsx_event_settings *event_settings;
> + const struct st_lsm6dsx_event_src *event_src;
> int err, data;
> s64 timestamp;
>
> @@ -2396,13 +2421,14 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
> return false;
>
> event_settings = &hw->settings->event_settings;
> - err = st_lsm6dsx_read_locked(hw, event_settings->wakeup_src_reg,
> + event_src = &event_settings->sources[ST_LSM6DSX_EVENT_WAKEUP];
> + err = st_lsm6dsx_read_locked(hw, event_src->status_reg,
> &data, sizeof(data));
> if (err < 0)
> return false;
>
> timestamp = iio_get_time_ns(hw->iio_devs[ST_LSM6DSX_ID_ACC]);
> - if ((data & hw->settings->event_settings.wakeup_src_z_mask) &&
> + if ((data & event_src->status_z_mask) &&
> (hw->enable_event & BIT(IIO_MOD_Z)))
> iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
> IIO_MOD_EVENT_CODE(IIO_ACCEL,
> @@ -2412,7 +2438,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
> IIO_EV_DIR_EITHER),
> timestamp);
>
> - if ((data & hw->settings->event_settings.wakeup_src_y_mask) &&
> + if ((data & event_src->status_y_mask) &&
> (hw->enable_event & BIT(IIO_MOD_Y)))
> iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
> IIO_MOD_EVENT_CODE(IIO_ACCEL,
> @@ -2422,7 +2448,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
> IIO_EV_DIR_EITHER),
> timestamp);
>
> - if ((data & hw->settings->event_settings.wakeup_src_x_mask) &&
> + if ((data & event_src->status_x_mask) &&
> (hw->enable_event & BIT(IIO_MOD_X)))
> iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC],
> IIO_MOD_EVENT_CODE(IIO_ACCEL,
> @@ -2432,7 +2458,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw)
> IIO_EV_DIR_EITHER),
> timestamp);
>
> - return data & event_settings->wakeup_src_status_mask;
> + return data & event_src->status_mask;
> }
>
> static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
> --
> 2.39.5
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2025-10-30 16:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-30 7:27 [PATCH 0/9] st_lsm6dsx: add tap event detection Francesco Lavra
2025-10-30 7:27 ` [PATCH 1/9] iio: imu: st_lsm6dsx: dynamically initialize iio_chan_spec data Francesco Lavra
2025-10-30 7:57 ` Andy Shevchenko
2025-10-30 11:03 ` Francesco Lavra
2025-10-30 16:42 ` Lorenzo Bianconi
2025-10-31 8:04 ` Francesco Lavra
2025-10-31 8:09 ` Andy Shevchenko
2025-10-31 8:26 ` Francesco Lavra
2025-10-31 8:32 ` Andy Shevchenko
2025-10-31 11:43 ` Francesco Lavra
2025-11-02 11:16 ` Jonathan Cameron
2025-11-03 9:24 ` Francesco Lavra
2025-11-09 13:32 ` Jonathan Cameron
2025-10-30 7:27 ` [PATCH 2/9] iio: imu: st_lsm6dsx: make event_settings more generic Francesco Lavra
2025-10-30 16:44 ` Lorenzo Bianconi [this message]
2025-10-31 8:08 ` Francesco Lavra
2025-10-30 7:27 ` [PATCH 3/9] iio: imu: st_lsm6dsx: move wakeup event enable mask to event_src Francesco Lavra
2025-10-30 7:59 ` Andy Shevchenko
2025-10-30 7:27 ` [PATCH 4/9] iio: imu: st_lsm6dsx: dynamically allocate iio_event_spec structs Francesco Lavra
2025-11-02 11:22 ` Jonathan Cameron
2025-10-30 7:27 ` [PATCH 5/9] iio: imu: st_lsm6dsx: rework code to check for enabled events Francesco Lavra
2025-10-30 7:27 ` [PATCH 6/9] iio: imu: st_lsm6dsx: remove event_threshold field from hw struct Francesco Lavra
2025-10-30 8:01 ` Andy Shevchenko
2025-10-30 11:10 ` Francesco Lavra
2025-10-30 13:49 ` Andy Shevchenko
2025-11-02 11:29 ` Jonathan Cameron
2025-11-02 13:45 ` Andy Shevchenko
2025-11-03 9:34 ` Francesco Lavra
2025-11-03 9:40 ` Andy Shevchenko
2025-11-03 14:53 ` David Lechner
2025-11-09 13:31 ` Jonathan Cameron
2025-10-30 7:27 ` [PATCH 7/9] iio: imu: st_lsm6dsx: make event management functions generic Francesco Lavra
2025-10-30 8:15 ` Andy Shevchenko
2025-10-30 11:17 ` Francesco Lavra
2025-10-30 13:36 ` Andy Shevchenko
2025-11-02 11:33 ` Jonathan Cameron
2025-10-30 7:27 ` [PATCH 8/9] iio: imu: st_lsm6dsx: add event configurability on a per axis basis Francesco Lavra
2025-10-30 8:24 ` Andy Shevchenko
2025-10-30 11:23 ` Francesco Lavra
2025-10-30 13:56 ` Andy Shevchenko
2025-11-17 19:23 ` Francesco Lavra
2025-11-18 10:44 ` Andy Shevchenko
2025-11-18 11:01 ` Francesco Lavra
2025-11-20 9:05 ` Andy Shevchenko
2025-11-20 11:43 ` Francesco Lavra
2025-11-20 13:59 ` Andy Shevchenko
2025-11-20 18:31 ` Andy Shevchenko
2025-11-21 9:14 ` Francesco Lavra
2025-11-21 9:31 ` Andy Shevchenko
2025-11-21 14:57 ` Francesco Lavra
2025-12-07 15:11 ` Jonathan Cameron
2025-10-30 7:27 ` [PATCH 9/9] iio: imu: st_lsm6dsx: add tap event detection Francesco Lavra
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=aQOV6cDVTJ-5uyCz@lore-desk \
--to=lorenzo@kernel.org \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=flavra@baylibre.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nuno.sa@analog.com \
/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 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.