| From 61901567862791597c76b14425e736d763d8a9dc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 13 Jun 2021 16:22:54 +0100 |
| Subject: iio: adc: at91-sama5d2: Fix buffer alignment in |
| iio_push_to_buffers_with_timestamp() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| |
| [ Upstream commit 8f884758966259fa8c50c137ac6d4ce9bb7859db ] |
| |
| To make code more readable, use a structure to express the channel |
| layout and ensure the timestamp is 8 byte aligned. |
| |
| Found during an audit of all calls of this function. |
| |
| Fixes: 5e1a1da0f8c9 ("iio: adc: at91-sama5d2_adc: add hw trigger and buffer support") |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Cc: Eugen Hristev <eugen.hristev@microchip.com> |
| Reviewed-by: Nuno Sรก <nuno.sa@analog.com> |
| Link: https://lore.kernel.org/r/20210613152301.571002-2-jic23@kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/adc/at91-sama5d2_adc.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c |
| index b917a4714a9c..b8139c435a4b 100644 |
| --- a/drivers/iio/adc/at91-sama5d2_adc.c |
| +++ b/drivers/iio/adc/at91-sama5d2_adc.c |
| @@ -403,7 +403,8 @@ struct at91_adc_state { |
| struct at91_adc_dma dma_st; |
| struct at91_adc_touch touch_st; |
| struct iio_dev *indio_dev; |
| - u16 buffer[AT91_BUFFER_MAX_HWORDS]; |
| + /* Ensure naturally aligned timestamp */ |
| + u16 buffer[AT91_BUFFER_MAX_HWORDS] __aligned(8); |
| /* |
| * lock to prevent concurrent 'single conversion' requests through |
| * sysfs. |
| -- |
| 2.30.2 |
| |
