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

Commit 0fdb567f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dw_dmac: store direction in the custom channel structure 



Currently the direction value comes from the generic slave configuration
structure and explicitly as a preparation function parameter. The first one is
kinda obsoleted. Thus, we have to store the value passed to the preparation
function somewhere in our structures to be able to use it later. The best
candidate to provide the storage is a custom channel structure. Until now we
still keep and check the direction field of the slave config structure as well.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 01126856

drivers/dma/dw_dmac.c

+10 −2
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ static void dwc_initialize(struct dw_dma_chan *dwc) 
		cfghi = dws->cfg_hi;

		cfglo |= dws->cfg_lo & ~DWC_CFGL_CH_PRIOR_MASK;

	} else {

		if (dwc->dma_sconfig.direction == DMA_MEM_TO_DEV)

		if (dwc->direction == DMA_MEM_TO_DEV)

			cfghi = DWC_CFGH_DST_PER(dwc->dma_sconfig.slave_id);

		else if (dwc->dma_sconfig.direction == DMA_DEV_TO_MEM)

		else if (dwc->direction == DMA_DEV_TO_MEM)

			cfghi = DWC_CFGH_SRC_PER(dwc->dma_sconfig.slave_id);

	}
@@ -721,6 +721,8 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 
		return NULL;

	}



	dwc->direction = DMA_MEM_TO_MEM;



	data_width = min_t(unsigned int, dwc->dw->data_width[dwc_get_sms(dws)],

					 dwc->dw->data_width[dwc_get_dms(dws)]);
@@ -805,6 +807,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	if (unlikely(!dws || !sg_len))

		return NULL;



	dwc->direction = direction;



	prev = first = NULL;



	switch (direction) {
@@ -981,6 +985,7 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig) 
		return -EINVAL;



	memcpy(&dwc->dma_sconfig, sconfig, sizeof(*sconfig));

	dwc->direction = sconfig->direction;



	convert_burst(&dwc->dma_sconfig.src_maxburst);

	convert_burst(&dwc->dma_sconfig.dst_maxburst);
@@ -1358,6 +1363,8 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan, 
	if (unlikely(!is_slave_direction(direction)))

		goto out_err;



	dwc->direction = direction;



	if (direction == DMA_MEM_TO_DEV)

		reg_width = __ffs(sconfig->dst_addr_width);

	else
@@ -1732,6 +1739,7 @@ static int dw_probe(struct platform_device *pdev) 
		channel_clear_bit(dw, CH_EN, dwc->mask);



		dwc->dw = dw;

		dwc->direction = DMA_TRANS_NONE;



		/* hardware configuration */

		if (autocfg) {

drivers/dma/dw_dmac_regs.h

+8 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/dmaengine.h>

#include <linux/dw_dmac.h>



#define DW_DMA_MAX_NR_CHANNELS	8
@@ -188,6 +189,7 @@ struct dw_dma_chan { 
	void __iomem			*ch_regs;

	u8				mask;

	u8				priority;

	enum dma_transfer_direction	direction;

	bool				paused;

	bool				initialized;