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

Commit 822c5676 authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

dma40: unify src/dst addr check 



Acked-by: default avatarPer Forlin <per.forlin@stericsson.com>
Acked-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent cc31b6f7

drivers/dma/ste_dma40.c

+16 −13
Original line number Original line Diff line number Diff line
@@ -1635,11 +1635,9 @@ static u32 stedma40_residue(struct dma_chan *chan) 
static int

static int

d40_prep_sg_log(struct d40_chan *chan, struct d40_desc *desc,

d40_prep_sg_log(struct d40_chan *chan, struct d40_desc *desc,

		struct scatterlist *sg_src, struct scatterlist *sg_dst,

		struct scatterlist *sg_src, struct scatterlist *sg_dst,

		unsigned int sg_len, enum dma_data_direction direction,

		unsigned int sg_len, dma_addr_t src_dev_addr,

		dma_addr_t dev_addr)

		dma_addr_t dst_dev_addr)

{

{

	dma_addr_t src_dev_addr = direction == DMA_FROM_DEVICE ? dev_addr : 0;

	dma_addr_t dst_dev_addr = direction == DMA_TO_DEVICE ? dev_addr : 0;

	struct stedma40_chan_cfg *cfg = &chan->dma_cfg;

	struct stedma40_chan_cfg *cfg = &chan->dma_cfg;

	struct stedma40_half_channel_info *src_info = &cfg->src_info;

	struct stedma40_half_channel_info *src_info = &cfg->src_info;

	struct stedma40_half_channel_info *dst_info = &cfg->dst_info;

	struct stedma40_half_channel_info *dst_info = &cfg->dst_info;
@@ -1665,11 +1663,9 @@ d40_prep_sg_log(struct d40_chan *chan, struct d40_desc *desc, 
static int

static int

d40_prep_sg_phy(struct d40_chan *chan, struct d40_desc *desc,

d40_prep_sg_phy(struct d40_chan *chan, struct d40_desc *desc,

		struct scatterlist *sg_src, struct scatterlist *sg_dst,

		struct scatterlist *sg_src, struct scatterlist *sg_dst,

		unsigned int sg_len, enum dma_data_direction direction,

		unsigned int sg_len, dma_addr_t src_dev_addr,

		dma_addr_t dev_addr)

		dma_addr_t dst_dev_addr)

{

{

	dma_addr_t src_dev_addr = direction == DMA_FROM_DEVICE ? dev_addr : 0;

	dma_addr_t dst_dev_addr = direction == DMA_TO_DEVICE ? dev_addr : 0;

	struct stedma40_chan_cfg *cfg = &chan->dma_cfg;

	struct stedma40_chan_cfg *cfg = &chan->dma_cfg;

	struct stedma40_half_channel_info *src_info = &cfg->src_info;

	struct stedma40_half_channel_info *src_info = &cfg->src_info;

	struct stedma40_half_channel_info *dst_info = &cfg->dst_info;

	struct stedma40_half_channel_info *dst_info = &cfg->dst_info;
@@ -1757,7 +1753,8 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
	    enum dma_data_direction direction, unsigned long dma_flags)

	    enum dma_data_direction direction, unsigned long dma_flags)

{

{

	struct d40_chan *chan = container_of(dchan, struct d40_chan, chan);

	struct d40_chan *chan = container_of(dchan, struct d40_chan, chan);

	dma_addr_t dev_addr = 0;

	dma_addr_t src_dev_addr = 0;

	dma_addr_t dst_dev_addr = 0;

	struct d40_desc *desc;

	struct d40_desc *desc;

	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;
@@ -1773,15 +1770,21 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
	if (desc == NULL)

	if (desc == NULL)

		goto err;

		goto err;





	if (direction != DMA_NONE)

	if (direction != DMA_NONE) {

		dev_addr = d40_get_dev_addr(chan, direction);

		dma_addr_t dev_addr = d40_get_dev_addr(chan, direction);



		if (direction == DMA_FROM_DEVICE)

			src_dev_addr = dev_addr;

		else if (direction == DMA_TO_DEVICE)

			dst_dev_addr = dev_addr;

	}





	if (chan_is_logical(chan))

	if (chan_is_logical(chan))

		ret = d40_prep_sg_log(chan, desc, sg_src, sg_dst,

		ret = d40_prep_sg_log(chan, desc, sg_src, sg_dst,

				      sg_len, direction, dev_addr);

				      sg_len, src_dev_addr, dst_dev_addr);

	else

	else

		ret = d40_prep_sg_phy(chan, desc, sg_src, sg_dst,

		ret = d40_prep_sg_phy(chan, desc, sg_src, sg_dst,

				      sg_len, direction, dev_addr);

				      sg_len, src_dev_addr, dst_dev_addr);





	if (ret) {

	if (ret) {

		chan_err(chan, "Failed to prepare %s sg job: %d\n",

		chan_err(chan, "Failed to prepare %s sg job: %d\n",