diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2016-05-12 16:54:08 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 20:19:51 -0400 |
| commit | c6ec15d8965d03a604bdcfde28a5c506b9de7043 (patch) | |
| tree | fbc7a32c1e6080e84292e49f5b0f9acb99556152 /drivers/dma | |
| parent | 6ef304587cf41e19312fa9fd81448ea6880ad475 (diff) | |
dmaengine: at_xdmac: align descriptors on 64 bits
[ Upstream commit 4a9723e8df68cfce4048517ee32e37f78854b6fb ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/dma')
| -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 ffa809f30b19..690d811d56b7 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -238,7 +238,7 @@ struct at_xdmac_lld { u32 mbr_cfg; /* Configuration 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; @@ -249,7 +249,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) { |