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

Commit db8196df authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: move drivers to dma_transfer_direction 



fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves dma/drivers/* to use new enum

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Viresh Kumar <viresh.kumar@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Mika Westerberg <mika.westerberg@iki.fi>
Cc: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Zhang Wei <zw@zh-kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Yong Wang <yong.y.wang@intel.com>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Cc: Boojin Kim <boojin.kim@samsung.com>
Cc: Barry Song <Baohua.Song@csr.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 49920bc6

arch/arm/mach-ep93xx/include/mach/dma.h

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
 */

struct ep93xx_dma_data {

	int				port;

	enum dma_data_direction		direction;

	enum dma_transfer_direction	direction;

	const char			*name;

};
@@ -80,14 +80,14 @@ static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan) 
 * channel supports given DMA direction. Only M2P channels have such

 * limitation, for M2M channels the direction is configurable.

 */

static inline enum dma_data_direction

static inline enum dma_transfer_direction

ep93xx_dma_chan_direction(struct dma_chan *chan)

{

	if (!ep93xx_dma_chan_is_m2p(chan))

		return DMA_NONE;



	/* even channels are for TX, odd for RX */

	return (chan->chan_id % 2 == 0) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;

	return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;

}



#endif /* __ASM_ARCH_DMA_H */

arch/arm/plat-nomadik/include/plat/ste_dma40.h

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static inline struct 
dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,

					    dma_addr_t addr,

					    unsigned int size,

					    enum dma_data_direction direction,

					    enum dma_transfer_direction direction,

					    unsigned long flags)

{

	struct scatterlist sg;
@@ -209,7 +209,7 @@ static inline struct 
dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,

					    dma_addr_t addr,

					    unsigned int size,

					    enum dma_data_direction direction,

					    enum dma_transfer_direction direction,

					    unsigned long flags)

{

	return NULL;

drivers/dma/amba-pl08x.c

+12 −12
Original line number Diff line number Diff line
@@ -882,9 +882,9 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan, 
		ch->signal = ret;



		/* Assign the flow control signal to this channel */

		if (txd->direction == DMA_TO_DEVICE)

		if (txd->direction == DMA_MEM_TO_DEV)

			txd->ccfg |= ch->signal << PL080_CONFIG_DST_SEL_SHIFT;

		else if (txd->direction == DMA_FROM_DEVICE)

		else if (txd->direction == DMA_DEV_TO_MEM)

			txd->ccfg |= ch->signal << PL080_CONFIG_SRC_SEL_SHIFT;

	}
@@ -1102,10 +1102,10 @@ static int dma_set_runtime_config(struct dma_chan *chan, 


	/* Transfer direction */

	plchan->runtime_direction = config->direction;

	if (config->direction == DMA_TO_DEVICE) {

	if (config->direction == DMA_MEM_TO_DEV) {

		addr_width = config->dst_addr_width;

		maxburst = config->dst_maxburst;

	} else if (config->direction == DMA_FROM_DEVICE) {

	} else if (config->direction == DMA_DEV_TO_MEM) {

		addr_width = config->src_addr_width;

		maxburst = config->src_maxburst;

	} else {
@@ -1136,7 +1136,7 @@ static int dma_set_runtime_config(struct dma_chan *chan, 
	cctl |= burst << PL080_CONTROL_SB_SIZE_SHIFT;

	cctl |= burst << PL080_CONTROL_DB_SIZE_SHIFT;



	if (plchan->runtime_direction == DMA_FROM_DEVICE) {

	if (plchan->runtime_direction == DMA_DEV_TO_MEM) {

		plchan->src_addr = config->src_addr;

		plchan->src_cctl = pl08x_cctl(cctl) | PL080_CONTROL_DST_INCR |

			pl08x_select_bus(plchan->cd->periph_buses,
@@ -1152,7 +1152,7 @@ static int dma_set_runtime_config(struct dma_chan *chan, 
		"configured channel %s (%s) for %s, data width %d, "

		"maxburst %d words, LE, CCTL=0x%08x\n",

		dma_chan_name(chan), plchan->name,

		(config->direction == DMA_FROM_DEVICE) ? "RX" : "TX",

		(config->direction == DMA_DEV_TO_MEM) ? "RX" : "TX",

		addr_width,

		maxburst,

		cctl);
@@ -1322,7 +1322,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy( 


static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(

		struct dma_chan *chan, struct scatterlist *sgl,

		unsigned int sg_len, enum dma_data_direction direction,

		unsigned int sg_len, enum dma_transfer_direction direction,

		unsigned long flags)

{

	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
@@ -1354,10 +1354,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg( 
	 */

	txd->direction = direction;



	if (direction == DMA_TO_DEVICE) {

	if (direction == DMA_MEM_TO_DEV) {

		txd->cctl = plchan->dst_cctl;

		slave_addr = plchan->dst_addr;

	} else if (direction == DMA_FROM_DEVICE) {

	} else if (direction == DMA_DEV_TO_MEM) {

		txd->cctl = plchan->src_cctl;

		slave_addr = plchan->src_addr;

	} else {
@@ -1368,10 +1368,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg( 
	}



	if (plchan->cd->device_fc)

		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER_PER :

		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER_PER :

			PL080_FLOW_PER2MEM_PER;

	else

		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER :

		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER :

			PL080_FLOW_PER2MEM;



	txd->ccfg |= tmp << PL080_CONFIG_FLOW_CONTROL_SHIFT;
@@ -1387,7 +1387,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg( 
		list_add_tail(&dsg->node, &txd->dsg_list);



		dsg->len = sg_dma_len(sg);

		if (direction == DMA_TO_DEVICE) {

		if (direction == DMA_MEM_TO_DEV) {

			dsg->src_addr = sg_phys(sg);

			dsg->dst_addr = slave_addr;

		} else {

drivers/dma/at_hdmac.c

+11 −11
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 
 */

static struct dma_async_tx_descriptor *

atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

		unsigned int sg_len, enum dma_data_direction direction,

		unsigned int sg_len, enum dma_transfer_direction direction,

		unsigned long flags)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);
@@ -678,7 +678,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


	dev_vdbg(chan2dev(chan), "prep_slave_sg (%d): %s f0x%lx\n",

			sg_len,

			direction == DMA_TO_DEVICE ? "TO DEVICE" : "FROM DEVICE",

			direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE",

			flags);



	if (unlikely(!atslave || !sg_len)) {
@@ -692,7 +692,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	ctrlb = ATC_IEN;



	switch (direction) {

	case DMA_TO_DEVICE:

	case DMA_MEM_TO_DEV:

		ctrla |=  ATC_DST_WIDTH(reg_width);

		ctrlb |=  ATC_DST_ADDR_MODE_FIXED

			| ATC_SRC_ADDR_MODE_INCR
@@ -725,7 +725,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
			total_len += len;

		}

		break;

	case DMA_FROM_DEVICE:

	case DMA_DEV_TO_MEM:

		ctrla |=  ATC_SRC_WIDTH(reg_width);

		ctrlb |=  ATC_DST_ADDR_MODE_INCR

			| ATC_SRC_ADDR_MODE_FIXED
@@ -787,7 +787,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
 */

static int

atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr,

		size_t period_len, enum dma_data_direction direction)

		size_t period_len, enum dma_transfer_direction direction)

{

	if (period_len > (ATC_BTSIZE_MAX << reg_width))

		goto err_out;
@@ -795,7 +795,7 @@ atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr, 
		goto err_out;

	if (unlikely(buf_addr & ((1 << reg_width) - 1)))

		goto err_out;

	if (unlikely(!(direction & (DMA_TO_DEVICE | DMA_FROM_DEVICE))))

	if (unlikely(!(direction & (DMA_DEV_TO_MEM | DMA_MEM_TO_DEV))))

		goto err_out;



	return 0;
@@ -810,7 +810,7 @@ atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr, 
static int

atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc,

		unsigned int period_index, dma_addr_t buf_addr,

		size_t period_len, enum dma_data_direction direction)

		size_t period_len, enum dma_transfer_direction direction)

{

	u32		ctrla;

	unsigned int	reg_width = atslave->reg_width;
@@ -822,7 +822,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc, 
		| period_len >> reg_width;



	switch (direction) {

	case DMA_TO_DEVICE:

	case DMA_MEM_TO_DEV:

		desc->lli.saddr = buf_addr + (period_len * period_index);

		desc->lli.daddr = atslave->tx_reg;

		desc->lli.ctrla = ctrla;
@@ -833,7 +833,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc, 
				| ATC_DIF(AT_DMA_PER_IF);

		break;



	case DMA_FROM_DEVICE:

	case DMA_DEV_TO_MEM:

		desc->lli.saddr = atslave->rx_reg;

		desc->lli.daddr = buf_addr + (period_len * period_index);

		desc->lli.ctrla = ctrla;
@@ -861,7 +861,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc, 
 */

static struct dma_async_tx_descriptor *

atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,

		size_t period_len, enum dma_data_direction direction)

		size_t period_len, enum dma_transfer_direction direction)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma_slave	*atslave = chan->private;
@@ -872,7 +872,7 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, 
	unsigned int		i;



	dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@0x%08x - %d (%d/%d)\n",

			direction == DMA_TO_DEVICE ? "TO DEVICE" : "FROM DEVICE",

			direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE",

			buf_addr,

			periods, buf_len, period_len);

drivers/dma/coh901318.c

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct coh901318_desc { 
	struct scatterlist *sg;

	unsigned int sg_len;

	struct coh901318_lli *lli;

	enum dma_data_direction dir;

	enum dma_transfer_direction dir;

	unsigned long flags;

	u32 head_config;

	u32 head_ctrl;
@@ -1034,7 +1034,7 @@ coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 


static struct dma_async_tx_descriptor *

coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

			unsigned int sg_len, enum dma_data_direction direction,

			unsigned int sg_len, enum dma_transfer_direction direction,

			unsigned long flags)

{

	struct coh901318_chan *cohc = to_coh901318_chan(chan);
@@ -1077,7 +1077,7 @@ coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	ctrl_last |= cohc->runtime_ctrl;

	ctrl |= cohc->runtime_ctrl;



	if (direction == DMA_TO_DEVICE) {

	if (direction == DMA_MEM_TO_DEV) {

		u32 tx_flags = COH901318_CX_CTRL_PRDD_SOURCE |

			COH901318_CX_CTRL_SRC_ADDR_INC_ENABLE;
@@ -1085,7 +1085,7 @@ coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
		ctrl_chained |= tx_flags;

		ctrl_last |= tx_flags;

		ctrl |= tx_flags;

	} else if (direction == DMA_FROM_DEVICE) {

	} else if (direction == DMA_DEV_TO_MEM) {

		u32 rx_flags = COH901318_CX_CTRL_PRDD_DEST |

			COH901318_CX_CTRL_DST_ADDR_INC_ENABLE;
@@ -1274,11 +1274,11 @@ static void coh901318_dma_set_runtimeconfig(struct dma_chan *chan, 
	int i = 0;



	/* We only support mem to per or per to mem transfers */

	if (config->direction == DMA_FROM_DEVICE) {

	if (config->direction == DMA_DEV_TO_MEM) {

		addr = config->src_addr;

		addr_width = config->src_addr_width;

		maxburst = config->src_maxburst;

	} else if (config->direction == DMA_TO_DEVICE) {

	} else if (config->direction == DMA_MEM_TO_DEV) {

		addr = config->dst_addr;

		addr_width = config->dst_addr_width;

		maxburst = config->dst_maxburst;