Commit 826b3a6a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Mark Brown

spi: spi-fsl-dspi: Fix interrupt-less DMA mode taking an XSPI code path

Interrupts are not necessary for DMA functionality, since the completion
event is provided by the DMA driver.

But if the driver fails to request the IRQ defined in the device tree,
it will call dspi_poll which would make the driver hang waiting for data
to become available in the RX FIFO.

Fixes: c55be305 ("spi: spi-fsl-dspi: Use poll mode in case the platform IRQ is missing")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20200318001603.9650-9-olteanv@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3d6224e6
...@@ -965,13 +965,15 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr, ...@@ -965,13 +965,15 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,
goto out; goto out;
} }
if (!dspi->irq) { if (trans_mode != DSPI_DMA_MODE) {
if (dspi->irq) {
wait_for_completion(&dspi->xfer_done);
reinit_completion(&dspi->xfer_done);
} else {
do { do {
status = dspi_poll(dspi); status = dspi_poll(dspi);
} while (status == -EINPROGRESS); } while (status == -EINPROGRESS);
} else if (trans_mode != DSPI_DMA_MODE) { }
wait_for_completion(&dspi->xfer_done);
reinit_completion(&dspi->xfer_done);
} }
spi_transfer_delay_exec(transfer); spi_transfer_delay_exec(transfer);
......
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