mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
dmaengine: fsl-edma: fix wrong tcd endianness for big-endian cpu
[ Upstream commit 8678c71c17
]
Due to recent fixes in m68k arch-specific I/O accessor macros, this
driver is not working anymore for ColdFire. Fix wrong tcd endianness
removing additional swaps, since edma_writex() functions should already
take care of any eventual swap if needed.
Note, i could only test the change in ColdFire mcf54415 and Vybrid
vf50 / Colibri where i don't see any issue. So, every feedback and
test for all other SoCs involved is really appreciated.
Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com>
Reported-by: kbuild test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20200701225205.1674463-1-angelo.dureghello@timesys.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6a3015ae35
commit
493aed3263
1 changed files with 14 additions and 12 deletions
|
@ -347,26 +347,28 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan,
|
|||
/*
|
||||
* TCD parameters are stored in struct fsl_edma_hw_tcd in little
|
||||
* endian format. However, we need to load the TCD registers in
|
||||
* big- or little-endian obeying the eDMA engine model endian.
|
||||
* big- or little-endian obeying the eDMA engine model endian,
|
||||
* and this is performed from specific edma_write functions
|
||||
*/
|
||||
edma_writew(edma, 0, ®s->tcd[ch].csr);
|
||||
edma_writel(edma, le32_to_cpu(tcd->saddr), ®s->tcd[ch].saddr);
|
||||
edma_writel(edma, le32_to_cpu(tcd->daddr), ®s->tcd[ch].daddr);
|
||||
|
||||
edma_writew(edma, le16_to_cpu(tcd->attr), ®s->tcd[ch].attr);
|
||||
edma_writew(edma, le16_to_cpu(tcd->soff), ®s->tcd[ch].soff);
|
||||
edma_writel(edma, (s32)tcd->saddr, ®s->tcd[ch].saddr);
|
||||
edma_writel(edma, (s32)tcd->daddr, ®s->tcd[ch].daddr);
|
||||
|
||||
edma_writel(edma, le32_to_cpu(tcd->nbytes), ®s->tcd[ch].nbytes);
|
||||
edma_writel(edma, le32_to_cpu(tcd->slast), ®s->tcd[ch].slast);
|
||||
edma_writew(edma, (s16)tcd->attr, ®s->tcd[ch].attr);
|
||||
edma_writew(edma, tcd->soff, ®s->tcd[ch].soff);
|
||||
|
||||
edma_writew(edma, le16_to_cpu(tcd->citer), ®s->tcd[ch].citer);
|
||||
edma_writew(edma, le16_to_cpu(tcd->biter), ®s->tcd[ch].biter);
|
||||
edma_writew(edma, le16_to_cpu(tcd->doff), ®s->tcd[ch].doff);
|
||||
edma_writel(edma, (s32)tcd->nbytes, ®s->tcd[ch].nbytes);
|
||||
edma_writel(edma, (s32)tcd->slast, ®s->tcd[ch].slast);
|
||||
|
||||
edma_writel(edma, le32_to_cpu(tcd->dlast_sga),
|
||||
edma_writew(edma, (s16)tcd->citer, ®s->tcd[ch].citer);
|
||||
edma_writew(edma, (s16)tcd->biter, ®s->tcd[ch].biter);
|
||||
edma_writew(edma, (s16)tcd->doff, ®s->tcd[ch].doff);
|
||||
|
||||
edma_writel(edma, (s32)tcd->dlast_sga,
|
||||
®s->tcd[ch].dlast_sga);
|
||||
|
||||
edma_writew(edma, le16_to_cpu(tcd->csr), ®s->tcd[ch].csr);
|
||||
edma_writew(edma, (s16)tcd->csr, ®s->tcd[ch].csr);
|
||||
}
|
||||
|
||||
static inline
|
||||
|
|
Loading…
Reference in a new issue