]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
dmaengine: at_xdmac: align descriptors on 64 bits
authorLudovic Desroches <ludovic.desroches@atmel.com>
Thu, 12 May 2016 14:54:08 +0000 (16:54 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 30 May 2016 05:17:52 +0000 (10:47 +0530)
Having descriptors aligned on 64 bits allows update CNDA and CUBC in an
atomic way.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Fixes: e1f7c9eee707 ("dmaengine: at_xdmac: creation of the atmel
eXtended DMA Controller driver")
Cc: stable@vger.kernel.org #v4.1 and later
Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/at_xdmac.c

index 8e304b1befc56385b8fc34d7697a529289d8ae3b..ba9b0b73fa479a7afae7c8934e4fbdd09925ebb9 100644 (file)
@@ -242,7 +242,7 @@ struct at_xdmac_lld {
        u32             mbr_dus;        /* Destination Microblock Stride Register */
 };
 
-
+/* 64-bit alignment needed to update CNDA and CUBC registers in an atomic way. */
 struct at_xdmac_desc {
        struct at_xdmac_lld             lld;
        enum dma_transfer_direction     direction;
@@ -253,7 +253,7 @@ struct at_xdmac_desc {
        unsigned int                    xfer_size;
        struct list_head                descs_list;
        struct list_head                xfer_node;
-};
+} __aligned(sizeof(u64));
 
 static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
 {