[PATCH 1/6] iio: proximity: sx_common: fix raw reads while the trigger is in use
From: Arnav Kapoor
Date: Mon Nov 16 2026 - 15:53:56 EST
sx_common_read_proximity() only reinitialises the completion after
waiting on it, so a complete() that arrives when no read is waiting is
consumed by the next read, which then returns old data without waiting
for a conversion that includes the channel it just enabled. This
happens in two ways:
- The device trigger has no validate_device(), so another IIO device
can use it. While it does, set_trigger_state() keeps the CONVDONE
interrupt enabled and the IRQ thread calls complete() for every
conversion.
- A read interrupted by a signal reinitialises the completion and
returns, but a CONVDONE interrupt already raised can still complete
it once the mutex is dropped.
Also, when it is done, the read disables the CONVDONE interrupt
unconditionally, which stops the trigger for the other device.
Reinitialise the completion before enabling the interrupt, and leave
the interrupt enabled when the trigger is, as set_trigger_state()
already does for pending raw reads.
The interrupted-wait case was reported by the Sashiko AI reviewer on an
unrelated sx9324 patch.
Fixes: 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver")
Signed-off-by: Arnav Kapoor <kapoorarnav43@xxxxxxxxx>
---
drivers/iio/proximity/sx_common.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/proximity/sx_common.c b/drivers/iio/proximity/sx_common.c
index 4d4937395d9a..66d06435da05 100644
--- a/drivers/iio/proximity/sx_common.c
+++ b/drivers/iio/proximity/sx_common.c
@@ -167,6 +167,15 @@ static int sx_common_put_event_channel(struct sx_common_data *data, int channel)
data->chan_event & ~BIT(channel));
}
+/* The trigger needs the CONVDONE interrupt too, leave it on while in use. */
+static int sx_common_put_convdone_irq(struct sx_common_data *data)
+{
+ if (data->trigger_enabled)
+ return 0;
+
+ return sx_common_disable_irq(data, SX_COMMON_CONVDONE_IRQ);
+}
+
/**
* sx_common_read_proximity() - Read raw proximity value.
* @data: Internal data
@@ -188,18 +197,22 @@ int sx_common_read_proximity(struct sx_common_data *data,
if (ret)
goto out;
+ /*
+ * Forget conversions that completed before this read, e.g. while the
+ * trigger was in use, so that we wait for a fresh one.
+ */
+ reinit_completion(&data->completion);
+
ret = sx_common_enable_irq(data, SX_COMMON_CONVDONE_IRQ);
if (ret)
goto out_put_channel;
mutex_unlock(&data->mutex);
- if (data->client->irq) {
+ if (data->client->irq)
ret = wait_for_completion_interruptible(&data->completion);
- reinit_completion(&data->completion);
- } else {
+ else
ret = data->chip_info->ops.wait_for_sample(data);
- }
mutex_lock(&data->mutex);
@@ -212,7 +225,7 @@ int sx_common_read_proximity(struct sx_common_data *data,
*val = sign_extend32(be16_to_cpu(rawval), chan->scan_type.realbits - 1);
- ret = sx_common_disable_irq(data, SX_COMMON_CONVDONE_IRQ);
+ ret = sx_common_put_convdone_irq(data);
if (ret)
goto out_put_channel;
@@ -225,7 +238,7 @@ int sx_common_read_proximity(struct sx_common_data *data,
return IIO_VAL_INT;
out_disable_irq:
- sx_common_disable_irq(data, SX_COMMON_CONVDONE_IRQ);
+ sx_common_put_convdone_irq(data);
out_put_channel:
sx_common_put_read_channel(data, chan->channel);
out:
--
2.53.0