p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spi: qup: Add completion timeout 

Add i/o completion timeout for DMA and PIO modes.

Signed-off-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Varadarajan Narayanan 2017-07-28 12:22:50 +05:30 committed by Mark Brown
parent 32ecab999f
commit 5f13fd60b1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/spi/spi-qup.c
View File

@ -331,8 +331,10 @@ static void spi_qup_dma_terminate(struct spi_master *master,
dmaengine_terminate_all(master->dma_rx); dmaengine_terminate_all(master->dma_rx);
} }
static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer) static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer,
unsigned long timeout)
{ {
struct spi_qup *qup = spi_master_get_devdata(master);
dma_async_tx_callback rx_done = NULL, tx_done = NULL; dma_async_tx_callback rx_done = NULL, tx_done = NULL;
int ret; int ret;
@ -357,10 +359,14 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer)
dma_async_issue_pending(master->dma_tx); dma_async_issue_pending(master->dma_tx);
} }
if (!wait_for_completion_timeout(&qup->done, timeout))
return -ETIMEDOUT;
return 0; return 0;
} }
static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer) static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer,
unsigned long timeout)
{ {
struct spi_qup *qup = spi_master_get_devdata(master); struct spi_qup *qup = spi_master_get_devdata(master);
int ret; int ret;
@ -379,6 +385,9 @@ static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer)
spi_qup_fifo_write(qup, xfer); spi_qup_fifo_write(qup, xfer);
if (!wait_for_completion_timeout(&qup->done, timeout))
return -ETIMEDOUT;
return 0; return 0;
} }
@ -632,9 +641,9 @@ static int spi_qup_transfer_one(struct spi_master *master,
spin_unlock_irqrestore(&controller->lock, flags); spin_unlock_irqrestore(&controller->lock, flags);
if (spi_qup_is_dma_xfer(controller->mode)) if (spi_qup_is_dma_xfer(controller->mode))
ret = spi_qup_do_dma(master, xfer); ret = spi_qup_do_dma(master, xfer, timeout);
else else
ret = spi_qup_do_pio(master, xfer); ret = spi_qup_do_pio(master, xfer, timeout);
if (ret) if (ret)
goto exit; goto exit;