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

Commit f0dad6e7 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'dma_complete' into next

parents b967aecf 7db5f727

crypto/async_tx/async_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx, 
		}

		device->device_issue_pending(chan);

	} else {

		if (dma_wait_for_async_tx(depend_tx) != DMA_SUCCESS)

		if (dma_wait_for_async_tx(depend_tx) != DMA_COMPLETE)

			panic("%s: DMA error waiting for depend_tx\n",

			      __func__);

		tx->tx_submit(tx);
@@ -280,7 +280,7 @@ void async_tx_quiesce(struct dma_async_tx_descriptor **tx) 
		 * we are referring to the correct operation

		 */

		BUG_ON(async_tx_test_ack(*tx));

		if (dma_wait_for_async_tx(*tx) != DMA_SUCCESS)

		if (dma_wait_for_async_tx(*tx) != DMA_COMPLETE)

			panic("%s: DMA error waiting for transaction\n",

			      __func__);

		async_tx_ack(*tx);

drivers/dma/amba-pl08x.c

+2 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan, 
	size_t bytes = 0;



	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;



	/*
@@ -1267,7 +1267,7 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan, 


	spin_lock_irqsave(&plchan->vc.lock, flags);

	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret != DMA_SUCCESS) {

	if (ret != DMA_COMPLETE) {

		vd = vchan_find_desc(&plchan->vc, cookie);

		if (vd) {

			/* On the issued list, so hasn't been processed yet */

drivers/dma/at_hdmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ atc_tx_status(struct dma_chan *chan, 
	int bytes = 0;



	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;

	/*

	 * There's no point calculating the residue if there's

drivers/dma/coh901318.c

+1 −1
Original line number Diff line number Diff line
@@ -2369,7 +2369,7 @@ coh901318_tx_status(struct dma_chan *chan, dma_cookie_t cookie, 
	enum dma_status ret;



	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

	if (ret == DMA_COMPLETE)

		return ret;



	dma_set_residue(txstate, coh901318_get_bytes_left(chan));

drivers/dma/cppi41.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static enum dma_status cppi41_dma_tx_status(struct dma_chan *chan, 


	/* lock */

	ret = dma_cookie_status(chan, cookie, txstate);

	if (txstate && ret == DMA_SUCCESS)

	if (txstate && ret == DMA_COMPLETE)

		txstate->residue = c->residue;

	/* unlock */