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: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Родитель
47d71bc75d
Коммит
397c59bce6
|
@ -694,7 +694,6 @@ static unsigned int mdc_get_new_events(struct mdc_chan *mchan)
|
||||||
static int mdc_terminate_all(struct dma_chan *chan)
|
static int mdc_terminate_all(struct dma_chan *chan)
|
||||||
{
|
{
|
||||||
struct mdc_chan *mchan = to_mdc_chan(chan);
|
struct mdc_chan *mchan = to_mdc_chan(chan);
|
||||||
struct mdc_tx_desc *mdesc;
|
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
LIST_HEAD(head);
|
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_chan_writel(mchan, MDC_CONTROL_AND_STATUS_CANCEL,
|
||||||
MDC_CONTROL_AND_STATUS);
|
MDC_CONTROL_AND_STATUS);
|
||||||
|
|
||||||
mdesc = mchan->desc;
|
if (mchan->desc) {
|
||||||
mchan->desc = NULL;
|
vchan_terminate_vdesc(&mchan->desc->vd);
|
||||||
|
mchan->desc = NULL;
|
||||||
|
}
|
||||||
vchan_get_all_descriptors(&mchan->vc, &head);
|
vchan_get_all_descriptors(&mchan->vc, &head);
|
||||||
|
|
||||||
mdc_get_new_events(mchan);
|
mdc_get_new_events(mchan);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&mchan->vc.lock, flags);
|
spin_unlock_irqrestore(&mchan->vc.lock, flags);
|
||||||
|
|
||||||
if (mdesc)
|
|
||||||
mdc_desc_free(&mdesc->vd);
|
|
||||||
vchan_dma_desc_free_list(&mchan->vc, &head);
|
vchan_dma_desc_free_list(&mchan->vc, &head);
|
||||||
|
|
||||||
return 0;
|
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,
|
static int mdc_slave_config(struct dma_chan *chan,
|
||||||
struct dma_slave_config *config)
|
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_tx_status = mdc_tx_status;
|
||||||
mdma->dma_dev.device_issue_pending = mdc_issue_pending;
|
mdma->dma_dev.device_issue_pending = mdc_issue_pending;
|
||||||
mdma->dma_dev.device_terminate_all = mdc_terminate_all;
|
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.device_config = mdc_slave_config;
|
||||||
|
|
||||||
mdma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
|
mdma->dma_dev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче