FAILED: patch "[PATCH] iio: imu: inv_icm42600: fix timestamping by limiting FIFO" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x affe3f077d7a4eeb25937f5323ff059a54b4712c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071317-seventeen-sedate-4f50@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From affe3f077d7a4eeb25937f5323ff059a54b4712c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Maneyrol <[email protected]>
Date: Mon, 29 Jun 2026 21:51:55 +0200
Subject: [PATCH] iio: imu: inv_icm42600: fix timestamping by limiting FIFO
reading
Timestamps are made by measuring the chip clock using the watermark interrupts. If we read more than watermark samples as done today, we are reducing the period between interrupts and distort the time measurement. Fix that by reading only watermark samples in the interrupt case.
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +5 -4
@@ -248,6 +248,7 @@ int inv_icm42600_buffer_update_watermark(struct inv_icm42600_state *st)/* compute watermark value in bytes */ wm_size = watermark * packet_size; + st->fifo.watermark.value = watermark;/* changing FIFO watermark requires to turn off watermark interrupt */ ret = regmap_update_bits_check(st->map, INV_ICM42600_REG_INT_SOURCE0,
@@ -454,11 +455,10 @@ int inv_icm42600_buffer_fifo_read(struct inv_icm42600_state *st, st->fifo.nb.accel =0 ; st->fifo.nb.total =0 ; -/* compute maximum FIFO read size */ +/* compute maximum FIFO read size (watermark for max = 0 interrupt case) */ if (max ==0 ) - max_count =sizeof (st->fifo.data); -else - max_count = max *inv_icm42600_get_packet_size (st->fifo.en); + max = st->fifo.watermark.value; + max_count = max *inv_icm42600_get_packet_size (st->fifo.en);/* read FIFO count value */ raw_fifo_count = (__be16 *)st->buffer;
@@ -574,6 +574,7 @@ int inv_icm42600_buffer_init(struct inv_icm42600_state *st) st->fifo.watermark.eff_gyro =1 ; st->fifo.watermark.eff_accel =1 ; + st->fifo.watermark.value =1 ;/* * Default FIFO configuration (bits 7 to 5)
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h +1 -0
@@ -34,6 +34,7 @@ struct inv_icm42600_fifo {unsigned int accel;unsigned int eff_gyro;unsigned int eff_accel; +unsigned int value; } watermark;size_t count;struct {
Sasha Levin
maintainerPATCH 1/4 iio: invensense: remove redundant initialization of variable period
From: Colin Ian King <[email protected]>
[ Upstream commit b58b13f156c00c2457035b7071eaaac105fe6836 ]
The variable period is being initialized with a value that is never read, it is being re-assigned a new value later on before it is read. The initialization is redundant and can be removed.
Cleans up clang scan build warning:
Value stored to 'period' during its initialization is never read [deadcode.DeadStores]
Stable-dep-of: affe3f077d7a ("iio: imu: inv_icm42600: fix timestamping by limiting FIFO reading")
--- drivers/iio/common/inv_sensors/inv_sensors_timestamp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/common/inv_sensors/inv_sensors_timestamp.c +1 -1
@@ -139,7 +139,7 @@ void inv_sensors_timestamp_interrupt(struct inv_sensors_timestamp *ts,struct inv_sensors_timestamp_interval *it;int64_t delta, interval;const uint32_t fifo_mult = fifo_period / ts->chip.clock_period; -uint32_t period = ts->period; +uint32_t period;bool valid = false;if (fifo_nb ==0 )
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/4 iio: invensense: fix timestamp glitches when switching frequency
From: Jean-Baptiste Maneyrol <[email protected]>
[ Upstream commit bf8367b00c33c64a9391c262bb2e11d274c9f2a4 ]
When a sensor is running and there is a FIFO frequency change due to another sensor turned on/off, there are glitches on timestamp. Fix that by using only interrupt timestamp when there is the corresponding sensor data in the FIFO.
Delete FIFO period handling and simplify internal functions.
Update integration inside inv_mpu6050 and inv_icm42600 drivers.
Stable-dep-of: affe3f077d7a ("iio: imu: inv_icm42600: fix timestamping by limiting FIFO reading")
--- .../inv_sensors/inv_sensors_timestamp.c | 24 +++++++++---------- .../imu/inv_icm42600/inv_icm42600_buffer.c | 20 +++++++--------- drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 2 +- .../linux/iio/common/inv_sensors_timestamp.h | 3 +-- 4 files changed, 21 insertions(+), 28 deletions(-)
drivers/iio/common/inv_sensors/inv_sensors_timestamp.c +11 -13
@@ -78,13 +78,13 @@ int inv_sensors_timestamp_update_odr(struct inv_sensors_timestamp *ts, }EXPORT_SYMBOL_NS_GPL (inv_sensors_timestamp_update_odr,IIO_INV_SENSORS_TIMESTAMP ); -static bool inv_validate_period (struct inv_sensors_timestamp *ts,uint32_t period,uint32_t mult) +static bool inv_validate_period (struct inv_sensors_timestamp *ts,uint32_t period) {uint32_t period_min, period_max;/* check that period is acceptable */ - period_min = ts->min_period * mult; - period_max = ts->max_period * mult; + period_min = ts->min_period * ts->mult; + period_max = ts->max_period * ts->mult;if (period > period_min && period < period_max)return true;else
@@ -92,15 +92,15 @@ static bool inv_validate_period(struct inv_sensors_timestamp *ts, uint32_t perio }static bool inv_update_chip_period (struct inv_sensors_timestamp *ts, -uint32_t mult,uint32_t period) +uint32_t period) {uint32_t new_chip_period; -if (!inv_validate_period (ts, period, mult)) +if (!inv_validate_period (ts, period))return false;/* update chip internal period estimation */ - new_chip_period = period / mult; + new_chip_period = period / ts->mult;inv_update_acc (&ts->chip_period, new_chip_period); ts->period = ts->mult * ts->chip_period.val;
@@ -133,16 +133,14 @@ static void inv_align_timestamp_it(struct inv_sensors_timestamp *ts) }void inv_sensors_timestamp_interrupt (struct inv_sensors_timestamp *ts, -uint32_t fifo_period,size_t fifo_nb, -size_t sensor_nb,int64_t timestamp) +size_t sample_nb,int64_t timestamp) {struct inv_sensors_timestamp_interval *it;int64_t delta, interval; -const uint32_t fifo_mult = fifo_period / ts->chip.clock_period;uint32_t period;bool valid = false; -if (fifo_nb ==0 ) +if (sample_nb ==0 )return ;/* update interrupt timestamp and compute chip and sensor periods */
@@ -152,14 +150,14 @@ void inv_sensors_timestamp_interrupt(struct inv_sensors_timestamp *ts, delta = it->up - it->lo;if (it->lo !=0 ) {/* compute period: delta time divided by number of samples */ - period =div_s64 (delta, fifo_nb); - valid =inv_update_chip_period (ts, fifo_mult, period); + period =div_s64 (delta, sample_nb); + valid =inv_update_chip_period (ts, period); }/* no previous data, compute theoritical value from interrupt */ if (ts->timestamp ==0 ) {/* elapsed time: sensor period * sensor samples number */ - interval = (int64_t )ts->period * (int64_t )sensor_nb; + interval = (int64_t )ts->period * (int64_t )sample_nb; ts->timestamp = it->up - interval;return ; }
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +8 -12
@@ -515,20 +515,20 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)return 0 ;/* handle gyroscope timestamp and FIFO data parsing */ - ts =iio_priv (st->indio_gyro); -inv_sensors_timestamp_interrupt (ts, st->fifo.period, st->fifo.nb.total, - st->fifo.nb.gyro, st->timestamp.gyro);if (st->fifo.nb.gyro >0 ) { + ts =iio_priv (st->indio_gyro); +inv_sensors_timestamp_interrupt (ts, st->fifo.nb.gyro, + st->timestamp.gyro); ret =inv_icm42600_gyro_parse_fifo (st->indio_gyro);if (ret)return ret; }/* handle accelerometer timestamp and FIFO data parsing */ - ts =iio_priv (st->indio_accel); -inv_sensors_timestamp_interrupt (ts, st->fifo.period, st->fifo.nb.total, - st->fifo.nb.accel, st->timestamp.accel);if (st->fifo.nb.accel >0 ) { + ts =iio_priv (st->indio_accel); +inv_sensors_timestamp_interrupt (ts, st->fifo.nb.accel, + st->timestamp.accel); ret =inv_icm42600_accel_parse_fifo (st->indio_accel);if (ret)return ret;
@@ -556,9 +556,7 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,if (st->fifo.nb.gyro >0 ) { ts =iio_priv (st->indio_gyro); -inv_sensors_timestamp_interrupt (ts, st->fifo.period, - st->fifo.nb.total, st->fifo.nb.gyro, - gyro_ts); +inv_sensors_timestamp_interrupt (ts, st->fifo.nb.gyro, gyro_ts); ret =inv_icm42600_gyro_parse_fifo (st->indio_gyro);if (ret)return ret;
@@ -566,9 +564,7 @@ int inv_icm42600_buffer_hwfifo_flush(struct inv_icm42600_state *st,if (st->fifo.nb.accel >0 ) { ts =iio_priv (st->indio_accel); -inv_sensors_timestamp_interrupt (ts, st->fifo.period, - st->fifo.nb.total, st->fifo.nb.accel, - accel_ts); +inv_sensors_timestamp_interrupt (ts, st->fifo.nb.accel, accel_ts); ret =inv_icm42600_accel_parse_fifo (st->indio_accel);if (ret)return ret;
drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c +1 -1
@@ -113,7 +113,7 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p) goto end_session;/* Each FIFO data contains all sensors, so same number for FIFO and sensor data */ fifo_period =NSEC_PER_SEC /INV_MPU6050_DIVIDER_TO_FIFO_RATE (st->chip_config.divider); -inv_sensors_timestamp_interrupt (&st->timestamp, fifo_period, nb, nb, pf->timestamp); +inv_sensors_timestamp_interrupt (&st->timestamp, nb, pf->timestamp);inv_sensors_timestamp_apply_odr (&st->timestamp, fifo_period, nb,0 );/* clear internal data buffer for avoiding kernel data leak */
include/linux/iio/common/inv_sensors_timestamp.h +1 -2
@@ -71,8 +71,7 @@ int inv_sensors_timestamp_update_odr(struct inv_sensors_timestamp *ts, uint32_t period, bool fifo);void inv_sensors_timestamp_interrupt (struct inv_sensors_timestamp *ts, -uint32_t fifo_period,size_t fifo_nb, -size_t sensor_nb,int64_t timestamp); +size_t sample_nb,int64_t timestamp);static inline int64_t inv_sensors_timestamp_pop (struct inv_sensors_timestamp *ts) {
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/4 iio: imu: inv_icm42600: stabilized timestamp in interrupt
In reply to Sasha LevinFrom: Jean-Baptiste Maneyrol <[email protected]>
[ Upstream commit d7bd473632d07f8a54655c270c0940cc3671c548 ]
Use IRQF_ONESHOT flag to ensure the timestamp is not updated in the hard handler during the thread handler. And compute and use the effective watermark value that correspond to this first timestamp.
This way we can ensure the timestamp is always corresponding to the value used by the timestamping mechanism. Otherwise, it is possible that between FIFO count read and FIFO processing the timestamp is overwritten in the hard handler.
Stable-dep-of: affe3f077d7a ("iio: imu: inv_icm42600: fix timestamping by limiting FIFO reading")
--- .../imu/inv_icm42600/inv_icm42600_buffer.c | 19 +++++++++++++++++-- .../imu/inv_icm42600/inv_icm42600_buffer.h | 2 ++ .../iio/imu/inv_icm42600/inv_icm42600_core.c | 1 + 3 files changed, 20 insertions(+), 2 deletions(-)
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +17 -2
@@ -222,10 +222,15 @@ int inv_icm42600_buffer_update_watermark(struct inv_icm42600_state *st) latency_accel = period_accel * wm_accel;/* 0 value for watermark means that the sensor is turned off */ +if (wm_gyro ==0 && wm_accel ==0 ) +return 0 ; +if (latency_gyro ==0 ) { watermark = wm_accel; + st->fifo.watermark.eff_accel = wm_accel; }else if (latency_accel ==0 ) { watermark = wm_gyro; + st->fifo.watermark.eff_gyro = wm_gyro; }else {/* compute the smallest latency that is a multiple of both */ if (latency_gyro <= latency_accel)
@@ -241,6 +246,13 @@ int inv_icm42600_buffer_update_watermark(struct inv_icm42600_state *st) watermark = latency / period;if (watermark <1 ) watermark =1 ; +/* update effective watermark */ + st->fifo.watermark.eff_gyro = latency / period_gyro; +if (st->fifo.watermark.eff_gyro <1 ) + st->fifo.watermark.eff_gyro =1 ; + st->fifo.watermark.eff_accel = latency / period_accel; +if (st->fifo.watermark.eff_accel <1 ) + st->fifo.watermark.eff_accel =1 ; }/* compute watermark value in bytes */
@@ -517,7 +529,7 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)/* handle gyroscope timestamp and FIFO data parsing */ if (st->fifo.nb.gyro >0 ) { ts =iio_priv (st->indio_gyro); -inv_sensors_timestamp_interrupt (ts, st->fifo.nb.gyro, +inv_sensors_timestamp_interrupt (ts, st->fifo.watermark.eff_gyro, st->timestamp.gyro); ret =inv_icm42600_gyro_parse_fifo (st->indio_gyro);if (ret)
@@ -527,7 +539,7 @@ int inv_icm42600_buffer_fifo_parse(struct inv_icm42600_state *st)/* handle accelerometer timestamp and FIFO data parsing */ if (st->fifo.nb.accel >0 ) { ts =iio_priv (st->indio_accel); -inv_sensors_timestamp_interrupt (ts, st->fifo.nb.accel, +inv_sensors_timestamp_interrupt (ts, st->fifo.watermark.eff_accel, st->timestamp.accel); ret =inv_icm42600_accel_parse_fifo (st->indio_accel);if (ret)
@@ -578,6 +590,9 @@ int inv_icm42600_buffer_init(struct inv_icm42600_state *st)unsigned int val;int ret; + st->fifo.watermark.eff_gyro =1 ; + st->fifo.watermark.eff_accel =1 ; +/* * Default FIFO configuration (bits 7 to 5) * - use invalid value
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h +2 -0
@@ -32,6 +32,8 @@ struct inv_icm42600_fifo {struct {unsigned int gyro;unsigned int accel; +unsigned int eff_gyro; +unsigned int eff_accel; } watermark;size_t count;struct {
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c +1 -0
@@ -523,6 +523,7 @@ static int inv_icm42600_irq_init(struct inv_icm42600_state *st, int irq,if (ret)return ret; + irq_type |=IRQF_ONESHOT ;return devm_request_threaded_irq (dev, irq, inv_icm42600_irq_timestamp, inv_icm42600_irq_handler, irq_type,"inv_icm42600" , st);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/4 iio: imu: inv_icm42600: fix timestamping by limiting FIFO reading
In reply to Sasha LevinFrom: Jean-Baptiste Maneyrol <[email protected]>
[ Upstream commit affe3f077d7a4eeb25937f5323ff059a54b4712c ]
Timestamps are made by measuring the chip clock using the watermark interrupts. If we read more than watermark samples as done today, we are reducing the period between interrupts and distort the time measurement. Fix that by reading only watermark samples in the interrupt case.
--- drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 9 +++++---- drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +5 -4
@@ -257,6 +257,7 @@ int inv_icm42600_buffer_update_watermark(struct inv_icm42600_state *st)/* compute watermark value in bytes */ wm_size = watermark * packet_size; + st->fifo.watermark.value = watermark;/* changing FIFO watermark requires to turn off watermark interrupt */ ret = regmap_update_bits_check(st->map, INV_ICM42600_REG_INT_SOURCE0,
@@ -476,11 +477,10 @@ int inv_icm42600_buffer_fifo_read(struct inv_icm42600_state *st, st->fifo.nb.accel =0 ; st->fifo.nb.total =0 ; -/* compute maximum FIFO read size */ +/* compute maximum FIFO read size (watermark for max = 0 interrupt case) */ if (max ==0 ) - max_count =sizeof (st->fifo.data); -else - max_count = max *inv_icm42600_get_packet_size (st->fifo.en); + max = st->fifo.watermark.value; + max_count = max *inv_icm42600_get_packet_size (st->fifo.en);/* read FIFO count value */ raw_fifo_count = (__be16 *)st->buffer;
@@ -592,6 +592,7 @@ int inv_icm42600_buffer_init(struct inv_icm42600_state *st) st->fifo.watermark.eff_gyro =1 ; st->fifo.watermark.eff_accel =1 ; + st->fifo.watermark.value =1 ;/* * Default FIFO configuration (bits 7 to 5)
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h +1 -0
@@ -34,6 +34,7 @@ struct inv_icm42600_fifo {unsigned int accel;unsigned int eff_gyro;unsigned int eff_accel; +unsigned int value; } watermark;size_t count;struct {
Signature · 1 line
2.53.0