| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aSAanUJMvYVJXtSq@lore-desk>
Date: Fri, 21 Nov 2025 08:54:05 +0100
From: Lorenzo Bianconi <lorenzo@...nel.org>
To: Francesco Lavra <flavra@...libre.com>
Cc: Jonathan Cameron <jic23@...nel.org>,
David Lechner <dlechner@...libre.com>,
Nuno Sá <nuno.sa@...log.com>,
Andy Shevchenko <andy@...nel.org>, linux-iio@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 2/9] iio: imu: st_lsm6dsx: make event_settings more
generic
> 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.
Hi Francesco,
just one nit inline, other than that:
Acked-by: Lorenzo Bianconi <lorenzo@...nel.org>
Regards,
Lorenzo
>
> Signed-off-by: Francesco Lavra <flavra@...libre.com>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 21 ++-
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 134 +++++++++++--------
> 2 files changed, 95 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index a4f558899767..4c3ff1cc0097 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -242,14 +242,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;
I think you can use st_lsm6dsx_reg struct here:
struct st_lsm6dsx_reg status;
> + u8 status_x_mask;
> + u8 status_y_mask;
> + u8 status_z_mask;
> +};
> +
> 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 a09df9d772dd..a71174e75f44 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -388,15 +388,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),
> },
> },
> {
> @@ -554,15 +558,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),
> },
> },
> {
> @@ -791,15 +799,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),
> },
> },
> {
> @@ -1028,15 +1040,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),
> },
> },
> {
> @@ -1209,15 +1225,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),
> },
> },
> {
> @@ -1415,15 +1435,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),
> },
> },
> {
> @@ -1935,7 +1959,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);
> @@ -2420,6 +2444,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 *src;
> int err, data;
> s64 timestamp;
>
> @@ -2427,13 +2452,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,
> + src = &event_settings->sources[ST_LSM6DSX_EVENT_WAKEUP];
> + err = st_lsm6dsx_read_locked(hw, 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 & 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,
> @@ -2443,7 +2469,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 & 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,
> @@ -2453,7 +2479,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 & 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,
> @@ -2463,7 +2489,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 & src->status_mask;
> }
>
> static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
> --
> 2.39.5
>
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists