Commit 4d5ac1ed authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: dw-mid: clear ongoing DMA transfers on timeout 



This patch shuts up any ongoing DMA transfer in case of error.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f051fc8f

drivers/spi/spi-dw-mid.c

+13 −0
Original line number Diff line number Diff line
@@ -270,11 +270,24 @@ static int mid_spi_dma_transfer(struct dw_spi *dws) 
	return 0;

}



static void mid_spi_dma_stop(struct dw_spi *dws)

{

	if (test_bit(TX_BUSY, &dws->dma_chan_busy)) {

		dmaengine_terminate_all(dws->txchan);

		clear_bit(TX_BUSY, &dws->dma_chan_busy);

	}

	if (test_bit(RX_BUSY, &dws->dma_chan_busy)) {

		dmaengine_terminate_all(dws->rxchan);

		clear_bit(RX_BUSY, &dws->dma_chan_busy);

	}

}



static struct dw_spi_dma_ops mid_dma_ops = {

	.dma_init	= mid_spi_dma_init,

	.dma_exit	= mid_spi_dma_exit,

	.dma_setup	= mid_spi_dma_setup,

	.dma_transfer	= mid_spi_dma_transfer,

	.dma_stop	= mid_spi_dma_stop,

};

#endif

drivers/spi/spi-dw.c

+3 −0
Original line number Diff line number Diff line
@@ -432,6 +432,9 @@ static void dw_spi_handle_err(struct spi_master *master, 
{

	struct dw_spi *dws = spi_master_get_devdata(master);



	if (dws->dma_mapped)

		dws->dma_ops->dma_stop(dws);



	spi_reset_chip(dws);

}

drivers/spi/spi-dw.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ struct dw_spi_dma_ops { 
	void (*dma_exit)(struct dw_spi *dws);

	int (*dma_setup)(struct dw_spi *dws);

	int (*dma_transfer)(struct dw_spi *dws);

	void (*dma_stop)(struct dw_spi *dws);

};



struct dw_spi {