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

Commit f4fa3d6f authored by Songjun Wu's avatar Songjun Wu Committed by Greg Kroah-Hartman
Browse files

dmaengine: at_xdmac: fix resume for cyclic transfers 



commit 611dcadb01c89d1d3521450c05a4ded332e5a32d upstream.

When having cyclic transfers, the channel was paused when performing
suspend but was not correctly resumed.

Signed-off-by: default avatarSongjun Wu <songjun.wu@atmel.com>
Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Fixes: e1f7c9ee ("dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver")
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ed338d4

drivers/dma/at_xdmac.c

+3 −0
Original line number Diff line number Diff line
@@ -1688,6 +1688,7 @@ static int at_xdmac_device_terminate_all(struct dma_chan *chan) 
	list_for_each_entry_safe(desc, _desc, &atchan->xfers_list, xfer_node)

		at_xdmac_remove_xfer(atchan, desc);



	clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);

	clear_bit(AT_XDMAC_CHAN_IS_CYCLIC, &atchan->status);

	spin_unlock_irqrestore(&atchan->lock, flags);
@@ -1820,6 +1821,8 @@ static int atmel_xdmac_resume(struct device *dev) 
		atchan = to_at_xdmac_chan(chan);

		at_xdmac_chan_write(atchan, AT_XDMAC_CC, atchan->save_cc);

		if (at_xdmac_chan_is_cyclic(atchan)) {

			if (at_xdmac_chan_is_paused(atchan))

				at_xdmac_device_resume(chan);

			at_xdmac_chan_write(atchan, AT_XDMAC_CNDA, atchan->save_cnda);

			at_xdmac_chan_write(atchan, AT_XDMAC_CNDC, atchan->save_cndc);

			at_xdmac_chan_write(atchan, AT_XDMAC_CIE, atchan->save_cim);