lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0601/1095] iio: adc: ad7887: Fix alignment for DMA safety
    Date
    From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

    [ Upstream commit b330ea6bc52468e183ced79189ff064f36c64aa7 ]

    ____cacheline_aligned is an insufficient guarantee for non-coherent DMA
    on platforms with 128 byte cachelines above L1. Switch to the updated
    IIO_DMA_MINALIGN definition.

    Update the comment to include 'may'.

    Fixes tag is clearly not where this was introduced but it is very unlikely
    anyone will back port it past that point.

    Fixes: 65dd3d3d7a9b ("staging:iio:ad7887: Squash everything into one file")
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Cc: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Nuno Sá <nuno.sa@analog.com>
    Link: https://lore.kernel.org/r/20220508175712.647246-18-jic23@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/adc/ad7887.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
    index f64999714a4d..965bdc8aa696 100644
    --- a/drivers/iio/adc/ad7887.c
    +++ b/drivers/iio/adc/ad7887.c
    @@ -66,13 +66,12 @@ struct ad7887_state {
    unsigned char tx_cmd_buf[4];

    /*
    - * DMA (thus cache coherency maintenance) requires the
    + * DMA (thus cache coherency maintenance) may require the
    * transfer buffers to live in their own cache lines.
    * Buffer needs to be large enough to hold two 16 bit samples and a
    * 64 bit aligned 64 bit timestamp.
    */
    - unsigned char data[ALIGN(4, sizeof(s64)) + sizeof(s64)]
    - ____cacheline_aligned;
    + unsigned char data[ALIGN(4, sizeof(s64)) + sizeof(s64)] __aligned(IIO_DMA_MINALIGN);
    };

    enum ad7887_supported_device_ids {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 23:38    [W:4.086 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site