Commit 98114304 authored by Sanchayan Maity's avatar Sanchayan Maity Committed by Mark Brown

spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE

Current DMA implementation had a bug where the DMA transfer would
exit the loop in dspi_transfer_one_message after the completion of
a single transfer. This results in a multi message transfer submitted
with SPI_IOC_MESSAGE to terminate incorrectly without an error.
Signed-off-by: default avatarSanchayan Maity <maitysanchayan@gmail.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 90ba3703
...@@ -714,7 +714,7 @@ static int dspi_transfer_one_message(struct spi_master *master, ...@@ -714,7 +714,7 @@ static int dspi_transfer_one_message(struct spi_master *master,
SPI_RSER_TFFFE | SPI_RSER_TFFFD | SPI_RSER_TFFFE | SPI_RSER_TFFFD |
SPI_RSER_RFDFE | SPI_RSER_RFDFD); SPI_RSER_RFDFE | SPI_RSER_RFDFD);
status = dspi_dma_xfer(dspi); status = dspi_dma_xfer(dspi);
goto out; break;
default: default:
dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n", dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n",
trans_mode); trans_mode);
...@@ -722,9 +722,13 @@ static int dspi_transfer_one_message(struct spi_master *master, ...@@ -722,9 +722,13 @@ static int dspi_transfer_one_message(struct spi_master *master,
goto out; goto out;
} }
if (wait_event_interruptible(dspi->waitq, dspi->waitflags)) if (trans_mode != DSPI_DMA_MODE) {
dev_err(&dspi->pdev->dev, "wait transfer complete fail!\n"); if (wait_event_interruptible(dspi->waitq,
dspi->waitflags = 0; dspi->waitflags))
dev_err(&dspi->pdev->dev,
"wait transfer complete fail!\n");
dspi->waitflags = 0;
}
if (transfer->delay_usecs) if (transfer->delay_usecs)
udelay(transfer->delay_usecs); udelay(transfer->delay_usecs);
......
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