Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tty: serial: fsl_lpuart: use the sg count from dma_map_sg

The dmaengine_prep_slave_sg needs to use sg count returned
by dma_map_sg, not use sport->dma_tx_nents, because the return
value of dma_map_sg is not always same with "nents".

When enabling iommu for lpuart + edma, iommu framework may concatenate
two sgs into one.

Fixes: 6250cc30c4c4e ("tty: serial: fsl_lpuart: Use scatter/gather DMA for Tx")
Cc: <stable@vger.kernel.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1572932977-17866-1-git-send-email-peng.fan@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Peng Fan and committed by
Greg Kroah-Hartman
487ee861 87951687

+2 -2
+2 -2
drivers/tty/serial/fsl_lpuart.c
··· 437 437 } 438 438 439 439 sport->dma_tx_desc = dmaengine_prep_slave_sg(sport->dma_tx_chan, sgl, 440 - sport->dma_tx_nents, 441 - DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); 440 + ret, DMA_MEM_TO_DEV, 441 + DMA_PREP_INTERRUPT); 442 442 if (!sport->dma_tx_desc) { 443 443 dma_unmap_sg(dev, sgl, sport->dma_tx_nents, DMA_TO_DEVICE); 444 444 dev_err(dev, "Cannot prepare TX slave DMA!\n");