Skip to content

Commit 8678c71

Browse files
adureghello-tsvinodkoul
authored andcommitted
dmaengine: fsl-edma: fix wrong tcd endianness for big-endian cpu
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 <[email protected]> Reported-by: kbuild test robot <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent fd17d1a commit 8678c71

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

drivers/dma/fsl-edma-common.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -352,26 +352,28 @@ static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan,
352352
/*
353353
* TCD parameters are stored in struct fsl_edma_hw_tcd in little
354354
* endian format. However, we need to load the TCD registers in
355-
* big- or little-endian obeying the eDMA engine model endian.
355+
* big- or little-endian obeying the eDMA engine model endian,
356+
* and this is performed from specific edma_write functions
356357
*/
357358
edma_writew(edma, 0, &regs->tcd[ch].csr);
358-
edma_writel(edma, le32_to_cpu(tcd->saddr), &regs->tcd[ch].saddr);
359-
edma_writel(edma, le32_to_cpu(tcd->daddr), &regs->tcd[ch].daddr);
360359

361-
edma_writew(edma, le16_to_cpu(tcd->attr), &regs->tcd[ch].attr);
362-
edma_writew(edma, le16_to_cpu(tcd->soff), &regs->tcd[ch].soff);
360+
edma_writel(edma, (s32)tcd->saddr, &regs->tcd[ch].saddr);
361+
edma_writel(edma, (s32)tcd->daddr, &regs->tcd[ch].daddr);
363362

364-
edma_writel(edma, le32_to_cpu(tcd->nbytes), &regs->tcd[ch].nbytes);
365-
edma_writel(edma, le32_to_cpu(tcd->slast), &regs->tcd[ch].slast);
363+
edma_writew(edma, (s16)tcd->attr, &regs->tcd[ch].attr);
364+
edma_writew(edma, tcd->soff, &regs->tcd[ch].soff);
366365

367-
edma_writew(edma, le16_to_cpu(tcd->citer), &regs->tcd[ch].citer);
368-
edma_writew(edma, le16_to_cpu(tcd->biter), &regs->tcd[ch].biter);
369-
edma_writew(edma, le16_to_cpu(tcd->doff), &regs->tcd[ch].doff);
366+
edma_writel(edma, (s32)tcd->nbytes, &regs->tcd[ch].nbytes);
367+
edma_writel(edma, (s32)tcd->slast, &regs->tcd[ch].slast);
370368

371-
edma_writel(edma, le32_to_cpu(tcd->dlast_sga),
369+
edma_writew(edma, (s16)tcd->citer, &regs->tcd[ch].citer);
370+
edma_writew(edma, (s16)tcd->biter, &regs->tcd[ch].biter);
371+
edma_writew(edma, (s16)tcd->doff, &regs->tcd[ch].doff);
372+
373+
edma_writel(edma, (s32)tcd->dlast_sga,
372374
&regs->tcd[ch].dlast_sga);
373375

374-
edma_writew(edma, le16_to_cpu(tcd->csr), &regs->tcd[ch].csr);
376+
edma_writew(edma, (s16)tcd->csr, &regs->tcd[ch].csr);
375377
}
376378

377379
static inline

0 commit comments

Comments
 (0)