summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2015-03-09 17:48:48 +0300
committerMark Brown <broonie@kernel.org>2015-03-09 21:11:13 +0300
commit4d5ac1edfdd79aea31983333cb53dd5db29559f9 (patch)
treed36ff072616b0352df81b3878444d22e28c10092 /drivers
parentf051fc8f117d95baaa3654d40e779c56c2c6d180 (diff)
downloadlinux-4d5ac1edfdd79aea31983333cb53dd5db29559f9.tar.xz
spi: dw-mid: clear ongoing DMA transfers on timeout
This patch shuts up any ongoing DMA transfer in case of error. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-dw-mid.c13
-rw-r--r--drivers/spi/spi-dw.c3
-rw-r--r--drivers/spi/spi-dw.h1
3 files changed, 17 insertions, 0 deletions
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index 3729cdd84e94..e614190daef6 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -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
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index c7c2fcc2b58e..d53cffe7ff22 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -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);
}
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 7351692494ec..7f130bd8f37a 100644
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -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 {