Skip to content

Commit

Permalink
dmaengine: imx-sdma: switch to dynamic context mode after script loaded
Browse files Browse the repository at this point in the history
Below comments got from Page4724 of Reference Manual of i.mx6q:
http://cache.freescale.com/files/32bit/doc/ref_manual/IMX6DQRM.pdf

--"Static context mode should be used for the first channel called
after reset to ensure that the all context RAM for that channel is
initialized during the context SAVE phase when the channel is
done or yields. Subsequent calls to the same channel or
different channels may use any of the dynamic context modes.
This will ensure that all context locations for the bootload
channel are initialized, and prevent undefined values in context
RAM from being loaded during the context restore if the
channel is re-started later"

Unfortunately, the rule was broken by commit(5b28aa3)
.This patch just take them back.

Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Robin Gong authored and Vinod Koul committed Mar 16, 2015
1 parent bdf6c79 commit 855832e
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,10 @@ static int sdma_run_channel0(struct sdma_engine *sdma)
dev_err(sdma->dev, "Timeout waiting for CH0 ready\n");
}

/* Set bits of CONFIG register with dynamic context switching */
if (readl(sdma->regs + SDMA_H_CONFIG) == 0)
writel_relaxed(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG);

return ret ? 0 : -ETIMEDOUT;
}

Expand Down Expand Up @@ -1394,9 +1398,6 @@ static int sdma_init(struct sdma_engine *sdma)

writel_relaxed(ccb_phys, sdma->regs + SDMA_H_C0PTR);

/* Set bits of CONFIG register with given context switching mode */
writel_relaxed(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG);

/* Initializes channel's priorities */
sdma_set_channel_priority(&sdma->channel[0], 7);

Expand Down

0 comments on commit 855832e

Please sign in to comment.