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

Commit 4de1247a authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Vinod Koul
Browse files

dmaengine: sh: rcar-dmac: add a new function to clear CHCR.DE with barrier



This patch adds a new function rcar_dmac_clear_chcr_de() to simplify
adding pause function later.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 538603c6
Loading
Loading
Loading
Loading
+11 −4
Original line number Original line Diff line number Diff line
@@ -759,18 +759,25 @@ static void rcar_dmac_chcr_de_barrier(struct rcar_dmac_chan *chan)
	dev_err(chan->chan.device->dev, "CHCR DE check error\n");
	dev_err(chan->chan.device->dev, "CHCR DE check error\n");
}
}


static void rcar_dmac_sync_tcr(struct rcar_dmac_chan *chan)
static void rcar_dmac_clear_chcr_de(struct rcar_dmac_chan *chan)
{
{
	u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);
	u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);


	if (!(chcr & RCAR_DMACHCR_DE))
		return;

	/* set DE=0 and flush remaining data */
	/* set DE=0 and flush remaining data */
	rcar_dmac_chan_write(chan, RCAR_DMACHCR, (chcr & ~RCAR_DMACHCR_DE));
	rcar_dmac_chan_write(chan, RCAR_DMACHCR, (chcr & ~RCAR_DMACHCR_DE));


	/* make sure all remaining data was flushed */
	/* make sure all remaining data was flushed */
	rcar_dmac_chcr_de_barrier(chan);
	rcar_dmac_chcr_de_barrier(chan);
}

static void rcar_dmac_sync_tcr(struct rcar_dmac_chan *chan)
{
	u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR);

	if (!(chcr & RCAR_DMACHCR_DE))
		return;

	rcar_dmac_clear_chcr_de(chan);


	/* back DE if remain data exists */
	/* back DE if remain data exists */
	if (rcar_dmac_chan_read(chan, RCAR_DMATCR))
	if (rcar_dmac_chan_read(chan, RCAR_DMATCR))