]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: ads7846 - make transfer buffers DMA safe
authorAlexander Stein <alexander.stein@systec-electronic.com>
Thu, 5 May 2011 15:40:14 +0000 (08:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 5 May 2011 15:50:47 +0000 (08:50 -0700)
req.sample needs its own cacheline otherwise accessing req.msg fetches
it in again.

Note: This effect doesn't occur if the underlying SPI driver doesn't use
DMA at all.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/touchscreen/ads7846.c

index c24946f512564e35925d0e6c090b7fd4a6c4eccd..ab51a8dbdb5a2e51cab773f41e06b4eff891c97a 100644 (file)
@@ -281,17 +281,25 @@ struct ser_req {
        u8                      command;
        u8                      ref_off;
        u16                     scratch;
-       __be16                  sample;
        struct spi_message      msg;
        struct spi_transfer     xfer[6];
+       /*
+        * DMA (thus cache coherency maintenance) requires the
+        * transfer buffers to live in their own cache lines.
+        */
+       __be16 sample ____cacheline_aligned;
 };
 
 struct ads7845_ser_req {
        u8                      command[3];
        u8                      pwrdown[3];
-       u8                      sample[3];
        struct spi_message      msg;
        struct spi_transfer     xfer[2];
+       /*
+        * DMA (thus cache coherency maintenance) requires the
+        * transfer buffers to live in their own cache lines.
+        */
+       u8 sample[3] ____cacheline_aligned;
 };
 
 static int ads7846_read12_ser(struct device *dev, unsigned command)