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

Commit 397c59bc authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: img-mdc-dma: Use vchan_terminate_vdesc() instead of desc_free 



To avoid race with vchan_complete, use the race free way to terminate
running transfer.

Implement the device_synchronize callback to make sure that the terminated
descriptor is freed.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 47d71bc7

drivers/dma/img-mdc-dma.c

+12 −5
Original line number Diff line number Diff line
@@ -694,7 +694,6 @@ static unsigned int mdc_get_new_events(struct mdc_chan *mchan) 
static int mdc_terminate_all(struct dma_chan *chan)

{

	struct mdc_chan *mchan = to_mdc_chan(chan);

	struct mdc_tx_desc *mdesc;

	unsigned long flags;

	LIST_HEAD(head);
@@ -703,21 +702,28 @@ static int mdc_terminate_all(struct dma_chan *chan) 
	mdc_chan_writel(mchan, MDC_CONTROL_AND_STATUS_CANCEL,

			MDC_CONTROL_AND_STATUS);



	mdesc = mchan->desc;

	if (mchan->desc) {

		vchan_terminate_vdesc(&mchan->desc->vd);

		mchan->desc = NULL;

	}

	vchan_get_all_descriptors(&mchan->vc, &head);



	mdc_get_new_events(mchan);



	spin_unlock_irqrestore(&mchan->vc.lock, flags);



	if (mdesc)

		mdc_desc_free(&mdesc->vd);

	vchan_dma_desc_free_list(&mchan->vc, &head);



	return 0;

}



static void mdc_synchronize(struct dma_chan *chan)

{

	struct mdc_chan *mchan = to_mdc_chan(chan);



	vchan_synchronize(&mchan->vc);

}



static int mdc_slave_config(struct dma_chan *chan,

			    struct dma_slave_config *config)

{
@@ -952,6 +958,7 @@ static int mdc_dma_probe(struct platform_device *pdev) 
	mdma->dma_dev.device_tx_status = mdc_tx_status;

	mdma->dma_dev.device_issue_pending = mdc_issue_pending;

	mdma->dma_dev.device_terminate_all = mdc_terminate_all;

	mdma->dma_dev.device_synchronize = mdc_synchronize;

	mdma->dma_dev.device_config = mdc_slave_config;



	mdma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);