diff options
| author |   Ludovic Desroches <ludovic.desroches@atmel.com> | 2016-05-12 16:54:08 +0200 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2016-05-30 10:47:52 +0530 |
| commit | 4a9723e8df68cfce4048517ee32e37f78854b6fb (patch) | |
| tree | 86ecfa37a7315ce9f5bec5db7316184fdc82b4c0 /drivers/dma/at_xdmac.c | |
| parent | MAINTAINERS: Add file patterns for dma device tree bindings (diff) | |
| download | linux-dev-4a9723e8df68cfce4048517ee32e37f78854b6fb.tar.xz linux-dev-4a9723e8df68cfce4048517ee32e37f78854b6fb.zip | |
dmaengine: at_xdmac: align descriptors on 64 bits
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>
Diffstat (limited to 'drivers/dma/at_xdmac.c')
| -rw-r--r-- | drivers/dma/at_xdmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index 8e304b1befc5..ba9b0b73fa47 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -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) { |