Unverified Commit 8dbbaa47 authored Sep 05, 2018 by Geert Uytterhoeven Committed by Mark Brown Sep 05, 2018

spi: rspi: Fix interrupted DMA transfers



When interrupted, wait_event_interruptible_timeout() returns
-ERESTARTSYS, and the SPI transfer in progress will fail, as expected:

    m25p80 spi0.0: SPI transfer failed: -512
    spi_master spi0: failed to transfer one message from queue

However, as the underlying DMA transfers may not have completed, all
subsequent SPI transfers may start to fail:

    spi_master spi0: receive timeout
    qspi_transfer_out_in() returned -110
    m25p80 spi0.0: SPI transfer failed: -110
    spi_master spi0: failed to transfer one message from queue

Fix this by calling dmaengine_terminate_all() not only for timeouts, but
also for errors.

This can be reproduced on r8a7991/koelsch, using "hd /dev/mtd0" followed
by CTRL-C.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org

parent c1ca59c2

drivers/spi/spi-rspi.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -598,11 +598,13 @@ static int rspi_dma_transfer(struct rspi_data rspi, struct sg_table tx,

	ret = wait_event_interruptible_timeout(rspi->wait,		ret = wait_event_interruptible_timeout(rspi->wait,
	rspi->dma_callbacked, HZ);		rspi->dma_callbacked, HZ);
	if (ret > 0 && rspi->dma_callbacked)		if (ret > 0 && rspi->dma_callbacked) {
	ret = 0;		ret = 0;
	else if (!ret) {		} else {
			if (!ret) {
	dev_err(&rspi->master->dev, "DMA timeout\n");		dev_err(&rspi->master->dev, "DMA timeout\n");
	ret = -ETIMEDOUT;		ret = -ETIMEDOUT;
			}
	if (tx)		if (tx)
	dmaengine_terminate_all(rspi->master->dma_tx);		dmaengine_terminate_all(rspi->master->dma_tx);
	if (rx)		if (rx)

Admin message