diff options
| author | Sowjanya Komatineni <skomatineni@nvidia.com> | 2019-03-26 22:56:27 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-01 15:38:58 +0700 |
| commit | 32bd1a9551cae34e6889afa235c7afdfede9aeac (patch) | |
| tree | 57d11b3e66a1f8e1c502ae43793fb6d48553b498 /drivers/spi/spi-tegra114.c | |
| parent | 1a89ac5b91895127f7c586ec5075c3753ca25501 (diff) | |
| download | linux-32bd1a9551cae34e6889afa235c7afdfede9aeac.tar.bz2 | |
spi: tegra114: terminate dma and reset on transfer timeout
Fixes: terminate DMA and perform controller reset on transfer timeout
to clear the FIFO's and errors.
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-tegra114.c')
| -rw-r--r-- | drivers/spi/spi-tegra114.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 876eb2acdef1..a6153b905d1a 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -869,7 +869,16 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, if (WARN_ON(ret == 0)) { dev_err(tspi->dev, "spi transfer timeout, err %d\n", ret); + if (tspi->is_curr_dma_xfer && + (tspi->cur_direction & DATA_DIR_TX)) + dmaengine_terminate_all(tspi->tx_dma_chan); + if (tspi->is_curr_dma_xfer && + (tspi->cur_direction & DATA_DIR_RX)) + dmaengine_terminate_all(tspi->rx_dma_chan); ret = -EIO; + reset_control_assert(tspi->rst); + udelay(2); + reset_control_deassert(tspi->rst); goto complete_xfer; } |