Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce64610d authored by Vipin Deep Kaur's avatar Vipin Deep Kaur
Browse files

spi: spi-msm-geni: Propagate missing change from 4.19 to 5.4 



Propagate following change from 4.19 to 5.4 for SPI driver.
'commit 185ecd35b11f ("spi: spi-geni-qcom: Reset the dma engine on
failure")'.

Change-Id: I3839d5bc773e7d7ea71ba6ff611f55f4869000f3
Signed-off-by: default avatarVipin Deep Kaur <vkaur@codeaurora.org>
parent 182605a3

drivers/spi/spi-msm-geni.c

+21 −3
Original line number Diff line number Diff line
@@ -1106,13 +1106,31 @@ static void handle_fifo_timeout(struct spi_geni_master *mas, 
				"Failed to cancel/abort m_cmd\n");

	}

	if (mas->cur_xfer_mode == SE_DMA) {

		if (xfer->tx_buf)

		if (xfer->tx_buf) {

			reinit_completion(&mas->xfer_done);

			writel_relaxed(1, mas->base +

				SE_DMA_TX_FSM_RST);

			timeout =

			wait_for_completion_timeout(&mas->xfer_done, HZ);

			if (!timeout)

				dev_err(mas->dev,

					"DMA TX RESET failed\n");

			geni_se_tx_dma_unprep(mas->wrapper_dev,

					xfer->tx_dma, xfer->len);

		if (xfer->rx_buf)

		}

		if (xfer->rx_buf) {

			reinit_completion(&mas->xfer_done);

			writel_relaxed(1, mas->base +

				SE_DMA_RX_FSM_RST);

			timeout =

			wait_for_completion_timeout(&mas->xfer_done, HZ);

			if (!timeout)

				dev_err(mas->dev,

					"DMA RX RESET failed\n");

			geni_se_rx_dma_unprep(mas->wrapper_dev,

				xfer->rx_dma, xfer->len);

		}

	}



}