Commit 4e2b10be authored by Robin Gong's avatar Robin Gong Committed by Shawn Guo
Browse files

dmaengine: imx-sdma: add terminated list for freed descriptor in worker 

Add terminated list for keeping descriptor so that it could be freed in
worker without any potential involving next descriptor raised up before
this descriptor freed, because vchan_get_all_descriptors get all
descriptors including the last terminated descriptor and the next
descriptor, hence, the next descriptor maybe freed unexpectly when it's
done in worker without this patch.
https://www.spinics.net/lists/dmaengine/msg23367.html



Signed-off-by: default avatarRobin Gong <yibin.gong@nxp.com>
Reported-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent b98ce2f4

drivers/dma/imx-sdma.c

+10 −7
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ struct sdma_channel { 
	enum dma_status			status;

	struct imx_dma_data		data;

	struct work_struct		terminate_worker;

	struct list_head                terminated;

	bool				is_ram_script;

};
@@ -1107,9 +1108,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) 
{

	struct sdma_channel *sdmac = container_of(work, struct sdma_channel,

						  terminate_worker);

	unsigned long flags;

	LIST_HEAD(head);



	/*

	 * According to NXP R&D team a delay of one BD SDMA cost time

	 * (maximum is 1ms) should be added after disable of the channel
@@ -1118,10 +1116,7 @@ static void sdma_channel_terminate_work(struct work_struct *work) 
	 */

	usleep_range(1000, 2000);



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

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

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

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

	vchan_dma_desc_free_list(&sdmac->vc, &sdmac->terminated);

}



static int sdma_terminate_all(struct dma_chan *chan)
@@ -1135,6 +1130,13 @@ static int sdma_terminate_all(struct dma_chan *chan) 


	if (sdmac->desc) {

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

		/*

		 * move out current descriptor into terminated list so that

		 * it could be free in sdma_channel_terminate_work alone

		 * later without potential involving next descriptor raised

		 * up before the last descriptor terminated.

		 */

		vchan_get_all_descriptors(&sdmac->vc, &sdmac->terminated);

		sdmac->desc = NULL;

		schedule_work(&sdmac->terminate_worker);

	}
@@ -2130,6 +2132,7 @@ static int sdma_probe(struct platform_device *pdev) 


		sdmac->channel = i;

		sdmac->vc.desc_free = sdma_desc_free;

		INIT_LIST_HEAD(&sdmac->terminated);

		INIT_WORK(&sdmac->terminate_worker,

				sdma_channel_terminate_work);

		/*