Skip to content

Commit

Permalink
spi: spi-fsl-dspi: Fix interrupt-less DMA mode taking an XSPI code path
Browse files Browse the repository at this point in the history
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: c55be30 ("spi: spi-fsl-dspi: Use poll mode in case the platform IRQ is missing")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20200318001603.9650-9-olteanv@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Vladimir Oltean authored and Mark Brown committed Mar 18, 2020
1 parent 3d6224e commit 826b3a6
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/spi/spi-fsl-dspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -965,13 +965,15 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,
goto out;
}

if (!dspi->irq) {
do {
status = dspi_poll(dspi);
} while (status == -EINPROGRESS);
} else if (trans_mode != DSPI_DMA_MODE) {
wait_for_completion(&dspi->xfer_done);
reinit_completion(&dspi->xfer_done);
if (trans_mode != DSPI_DMA_MODE) {
if (dspi->irq) {
wait_for_completion(&dspi->xfer_done);
reinit_completion(&dspi->xfer_done);
} else {
do {
status = dspi_poll(dspi);
} while (status == -EINPROGRESS);
}
}

spi_transfer_delay_exec(transfer);
Expand Down

0 comments on commit 826b3a6

Please sign in to comment.