patch "iio: adc: ti-ads7950: use iio_push_to_buffers_with_ts_unaligned()" added to char-misc-next
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iio: adc: ti-ads7950: use iio_push_to_buffers_with_ts_unaligned()
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-next branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will also be merged in the next major kernel release during the merge window.
If you have any questions about this process, please let me know.
From 7806c060cceb2d6895efbb6cff2f2f17cf1ec5de Mon Sep 17 00:00:00 2001
From: David Lechner <[email protected]>
Date: Sat, 14 Mar 2026 16:12:24 -0500
Subject: iio: adc: ti-ads7950: use iio_push_to_buffers_with_ts_unaligned()
Use iio_push_to_buffers_with_ts_unaligned() to avoid unaligned access when writing the timestamp in the rx_buf.
The previous implementation would have been fine on architectures that support 4-byte alignment of 64-bit integers but could cause issues on architectures that require 8-byte alignment.
--- drivers/iio/adc/ti-ads7950.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/iio/adc/ti-ads7950.c +5 -6
@@ -47,8 +47,6 @@#define TI_ADS7950_MAX_CHAN 16#define TI_ADS7950_NUM_GPIOS 4 -#define TI_ADS7950_TIMESTAMP_SIZE (sizeof(int64_t) / sizeof(__be16)) -/* val = value, dec = left shift, bits = number of bits of the mask */ #define TI_ADS7950_EXTRACT (val, dec, bits) \ (((val) >> (dec)) & ((1 << (bits)) - 1))
@@ -105,8 +103,7 @@ struct ti_ads7950_state {* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -u16 rx_buf[TI_ADS7950_MAX_CHAN +2 +TI_ADS7950_TIMESTAMP_SIZE ] -__aligned(IIO_DMA_MINALIGN) ; +u16 rx_buf[TI_ADS7950_MAX_CHAN +2 ]__aligned(IIO_DMA_MINALIGN) ;u16 tx_buf[TI_ADS7950_MAX_CHAN +2 ];u16 single_tx;u16 single_rx;
@@ -307,8 +304,10 @@ static irqreturn_t ti_ads7950_trigger_handler(int irq, void *p)if (ret <0 ) goto out; -iio_push_to_buffers_with_timestamp (indio_dev, &st->rx_buf[2 ], -iio_get_time_ns (indio_dev)); +iio_push_to_buffers_with_ts_unaligned (indio_dev, &st->rx_buf[2 ], +sizeof (*st->rx_buf) * +TI_ADS7950_MAX_CHAN , +iio_get_time_ns (indio_dev)); out:mutex_unlock (&st->slock);
Signature · 1 line
2.53.0