aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorNuno Sa <nuno.sa@analog.com>2024-01-31 10:16:47 +0100
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2024-02-04 15:01:14 +0000
commit862cf85fef85becc55a173387527adb4f076fab0 (patch)
tree862e503454483c8c5c7aa7dcf273b3686247a4eb
parentiio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP (diff)
downloadwireguard-linux-862cf85fef85becc55a173387527adb4f076fab0.tar.xz
wireguard-linux-862cf85fef85becc55a173387527adb4f076fab0.zip
iio: commom: st_sensors: ensure proper DMA alignment
Aligning the buffer to the L1 cache is not sufficient in some platforms as they might have larger cacheline sizes for caches after L1 and thus, we can't guarantee DMA safety. That was the whole reason to introduce IIO_DMA_MINALIGN in [1]. Do the same for st_sensors common buffer. While at it, moved the odr_lock before buffer_data as we definitely don't want any other data to share a cacheline with the buffer. [1]: https://lore.kernel.org/linux-iio/20220508175712.647246-2-jic23@kernel.org/ Fixes: e031d5f558f1 ("iio:st_sensors: remove buffer allocation at each buffer enable") Signed-off-by: Nuno Sa <nuno.sa@analog.com> Cc: <Stable@vger.kernel.org> Link: https://lore.kernel.org/r/20240131-dev_dma_safety_stm-v2-1-580c07fae51b@analog.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r--include/linux/iio/common/st_sensors.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 607c3a89a647..f9ae5cdd884f 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -258,9 +258,9 @@ struct st_sensor_data {
bool hw_irq_trigger;
s64 hw_timestamp;
- char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE] ____cacheline_aligned;
-
struct mutex odr_lock;
+
+ char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE] __aligned(IIO_DMA_MINALIGN);
};
#ifdef CONFIG_IIO_BUFFER