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

Commit d762ab33 authored by Eric Long's avatar Eric Long Committed by Vinod Koul
Browse files

dmaengine: sprd: Get transfer residue depending on the transfer direction 



Add one field to save the transfer direction for struct sprd_dma_desc,
which is used to get correct transfer residue depending on the transfer
direction.

[Baolin Wang adds one field to present the transfer direction]
Signed-off-by: default avatarEric Long <eric.long@spreadtrum.com>
Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent a0ecabf5

drivers/dma/sprd-dma.c

+20 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct sprd_dma_chn_hw { 
struct sprd_dma_desc {

	struct virt_dma_desc	vd;

	struct sprd_dma_chn_hw	chn_hw;

	enum dma_transfer_direction dir;

};



/* dma channel description */
@@ -331,6 +332,17 @@ static void sprd_dma_stop_and_disable(struct sprd_dma_chn *schan) 
	sprd_dma_disable_chn(schan);

}



static unsigned long sprd_dma_get_src_addr(struct sprd_dma_chn *schan)

{

	unsigned long addr, addr_high;



	addr = readl(schan->chn_base + SPRD_DMA_CHN_SRC_ADDR);

	addr_high = readl(schan->chn_base + SPRD_DMA_CHN_WARP_PTR) &

		    SPRD_DMA_HIGH_ADDR_MASK;



	return addr | (addr_high << SPRD_DMA_HIGH_ADDR_OFFSET);

}



static unsigned long sprd_dma_get_dst_addr(struct sprd_dma_chn *schan)

{

	unsigned long addr, addr_high;
@@ -534,7 +546,12 @@ static enum dma_status sprd_dma_tx_status(struct dma_chan *chan, 
		else

			pos = 0;

	} else if (schan->cur_desc && schan->cur_desc->vd.tx.cookie == cookie) {

		struct sprd_dma_desc *sdesc = to_sprd_dma_desc(vd);



		if (sdesc->dir == DMA_DEV_TO_MEM)

			pos = sprd_dma_get_dst_addr(schan);

		else

			pos = sprd_dma_get_src_addr(schan);

	} else {

		pos = 0;

	}
@@ -804,6 +821,8 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	if (!sdesc)

		return NULL;



	sdesc->dir = dir;



	for_each_sg(sgl, sg, sglen, i) {

		len = sg_dma_len(sg);