Skip to content

spi: spi-imx: complete DMA transfers on target mode #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andy9a9 wants to merge 1 commit into
base: lf-6.12.y
Choose a base branch
from
+16 −5
Open

spi: spi-imx: complete DMA transfers on target mode #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions drivers/spi/spi-imx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,19 +1580,19 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,

spi_imx->devtype_data->trigger(spi_imx);

if (wait_for_completion_interruptible(&spi_imx->dma_tx_completion) ||
if (wait_for_completion_interruptible(&spi_imx->dma_rx_completion) ||
spi_imx->target_aborted) {
dev_dbg(spi_imx->dev,
"I/O Error in DMA TX interrupted\n");
"I/O Error in DMA RX interrupted\n");
dmaengine_terminate_all(controller->dma_tx);
dmaengine_terminate_all(controller->dma_rx);
return -EINTR;
}

if (wait_for_completion_interruptible(&spi_imx->dma_rx_completion) ||
if (wait_for_completion_interruptible(&spi_imx->dma_tx_completion) ||
spi_imx->target_aborted) {
dev_dbg(spi_imx->dev,
"I/O Error in DMA RX interrupted\n");
"I/O Error in DMA TX interrupted\n");
dmaengine_terminate_all(controller->dma_tx);
dmaengine_terminate_all(controller->dma_rx);
return -EINTR;
Expand Down Expand Up @@ -1834,7 +1834,18 @@ static int spi_imx_target_abort(struct spi_controller *controller)
struct spi_imx_data *spi_imx = spi_controller_get_devdata(controller);

spi_imx->target_aborted = true;
complete(&spi_imx->xfer_done);

if (spi_imx->target_mode && spi_imx->usedma) {
if (!completion_done(&spi_imx->dma_rx_completion))
complete(&spi_imx->dma_rx_completion);
dmaengine_terminate_sync(controller->dma_rx);

if (!completion_done(&spi_imx->dma_tx_completion))
complete(&spi_imx->dma_tx_completion);
dmaengine_terminate_sync(controller->dma_tx);
} else {
complete(&spi_imx->xfer_done);
}

return 0;
}
Expand Down