Unverified Commit f40e2e86 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11290 Add exception protection processing for vd in axi_chan_handle_err function 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cheng Yu <serein.chengyu@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2FEMEMMSPISMTAGN27WJVVDJDILWJVJL/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALLDN 
 
Link:https://gitee.com/openeuler/kernel/pulls/11290

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 81002131 89cee4b1

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+6 −0
Original line number Diff line number Diff line
@@ -551,6 +551,11 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) 


	/* The bad descriptor currently is in the head of vc list */

	vd = vchan_next_desc(&chan->vc);

	if (!vd) {

		dev_err(chan2dev(chan), "BUG: %s, IRQ with no descriptors\n",

			axi_chan_name(chan));

		goto out;

	}

	/* Remove the completed descriptor from issued list */

	list_del(&vd->node);
@@ -565,6 +570,7 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) 
	/* Try to restart the controller */

	axi_chan_start_first_queued(chan);



out:

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

}