Commit 8592f024 authored by Robin Gong's avatar Robin Gong Committed by Shawn Guo
Browse files

Revert "dmaengine: imx-sdma: refine to load context only once" 



This reverts commit ad0d92d7, because
in spi-imx case, burst length may be changed dynamically.

Fixes: ad0d92d7 ("dmaengine: imx-sdma: refine to load context only once")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRobin Gong <yibin.gong@nxp.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Tested-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 394e1fb8

drivers/dma/imx-sdma.c

+0 −8
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ struct sdma_channel { 
	unsigned long			watermark_level;

	u32				shp_addr, per_addr;

	enum dma_status			status;

	bool				context_loaded;

	struct imx_dma_data		data;

	struct work_struct		terminate_worker;

};
@@ -1008,9 +1007,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) 
	int ret;

	unsigned long flags;



	if (sdmac->context_loaded)

		return 0;



	if (sdmac->direction == DMA_DEV_TO_MEM)

		load_address = sdmac->pc_from_device;

	else if (sdmac->direction == DMA_DEV_TO_DEV)
@@ -1053,8 +1049,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) 


	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);



	sdmac->context_loaded = true;



	return ret;

}
@@ -1093,7 +1087,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) 
	vchan_get_all_descriptors(&sdmac->vc, &head);

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

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

	sdmac->context_loaded = false;

}



static int sdma_terminate_all(struct dma_chan *chan)
@@ -1361,7 +1354,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) 


	sdmac->event_id0 = 0;

	sdmac->event_id1 = 0;

	sdmac->context_loaded = false;



	sdma_set_channel_priority(sdmac, 0);