Commit 22ee9de1 authored by Michael Walle's avatar Michael Walle Committed by Mark Brown

spi: spi-fsl-dspi: fix DMA mapping

Use the correct device to request the DMA mapping. Otherwise the IOMMU
doesn't get the mapping and it will generate a page fault.

The error messages look like:
[    3.008452] arm-smmu 5000000.iommu: Unhandled context fault: fsr=0x402, iova=0xf9800000, fsynr=0x3f0022, cbfrsynra=0x828, cb=8
[    3.020123] arm-smmu 5000000.iommu: Unhandled context fault: fsr=0x402, iova=0xf9800000, fsynr=0x3f0022, cbfrsynra=0x828, cb=8

This was tested on a custom board with a LS1028A SoC.
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20200310073313.21277-1-michael@walle.ccSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 36098a1d
...@@ -497,14 +497,16 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) ...@@ -497,14 +497,16 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr)
goto err_tx_channel; goto err_tx_channel;
} }
dma->tx_dma_buf = dma_alloc_coherent(dev, dspi->devtype_data->dma_bufsize, dma->tx_dma_buf = dma_alloc_coherent(dma->chan_tx->device->dev,
dspi->devtype_data->dma_bufsize,
&dma->tx_dma_phys, GFP_KERNEL); &dma->tx_dma_phys, GFP_KERNEL);
if (!dma->tx_dma_buf) { if (!dma->tx_dma_buf) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_tx_dma_buf; goto err_tx_dma_buf;
} }
dma->rx_dma_buf = dma_alloc_coherent(dev, dspi->devtype_data->dma_bufsize, dma->rx_dma_buf = dma_alloc_coherent(dma->chan_rx->device->dev,
dspi->devtype_data->dma_bufsize,
&dma->rx_dma_phys, GFP_KERNEL); &dma->rx_dma_phys, GFP_KERNEL);
if (!dma->rx_dma_buf) { if (!dma->rx_dma_buf) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -541,10 +543,12 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) ...@@ -541,10 +543,12 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr)
return 0; return 0;
err_slave_config: err_slave_config:
dma_free_coherent(dev, dspi->devtype_data->dma_bufsize, dma_free_coherent(dma->chan_rx->device->dev,
dspi->devtype_data->dma_bufsize,
dma->rx_dma_buf, dma->rx_dma_phys); dma->rx_dma_buf, dma->rx_dma_phys);
err_rx_dma_buf: err_rx_dma_buf:
dma_free_coherent(dev, dspi->devtype_data->dma_bufsize, dma_free_coherent(dma->chan_tx->device->dev,
dspi->devtype_data->dma_bufsize,
dma->tx_dma_buf, dma->tx_dma_phys); dma->tx_dma_buf, dma->tx_dma_phys);
err_tx_dma_buf: err_tx_dma_buf:
dma_release_channel(dma->chan_tx); dma_release_channel(dma->chan_tx);
...@@ -560,20 +564,19 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) ...@@ -560,20 +564,19 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr)
static void dspi_release_dma(struct fsl_dspi *dspi) static void dspi_release_dma(struct fsl_dspi *dspi)
{ {
struct fsl_dspi_dma *dma = dspi->dma; struct fsl_dspi_dma *dma = dspi->dma;
struct device *dev = &dspi->pdev->dev;
if (!dma) if (!dma)
return; return;
if (dma->chan_tx) { if (dma->chan_tx) {
dma_unmap_single(dev, dma->tx_dma_phys, dma_unmap_single(dma->chan_tx->device->dev, dma->tx_dma_phys,
dspi->devtype_data->dma_bufsize, dspi->devtype_data->dma_bufsize,
DMA_TO_DEVICE); DMA_TO_DEVICE);
dma_release_channel(dma->chan_tx); dma_release_channel(dma->chan_tx);
} }
if (dma->chan_rx) { if (dma->chan_rx) {
dma_unmap_single(dev, dma->rx_dma_phys, dma_unmap_single(dma->chan_rx->device->dev, dma->rx_dma_phys,
dspi->devtype_data->dma_bufsize, dspi->devtype_data->dma_bufsize,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
dma_release_channel(dma->chan_rx); dma_release_channel(dma->chan_rx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment