diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-05-21 14:02:35 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:29:15 +0100 |
| commit | 795bd4fa3417ef8fd7f5e0965c8dbe3817393b49 (patch) | |
| tree | 6a332a3b2d6ca8e52bcba52e1eba02800343e216 /drivers | |
| parent | 4cb5bbfb6626289d638fa5cee9357305376d6327 (diff) | |
| download | linux-stable-795bd4fa3417ef8fd7f5e0965c8dbe3817393b49.tar.gz linux-stable-795bd4fa3417ef8fd7f5e0965c8dbe3817393b49.tar.bz2 linux-stable-795bd4fa3417ef8fd7f5e0965c8dbe3817393b49.zip | |
dma: mv_xor: Flush descriptors before activating a channel
commit 5a9a55bf9157d3490b0c8c4c81d4708602c26e07 upstream.
We need to use writel() instead of writel_relaxed() when starting
a channel, to ensure all the descriptors have been flushed before
the activation.
While at it, remove the unneeded read-modify-write and make the
code simpler.
Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
[bwh: Backported to 3.2: it was using __raw_readl() and __raw_writel()
which are just as wrong]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/mv_xor.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 9a353c2216d0..9b01145e6723 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -218,12 +218,10 @@ static void mv_set_mode(struct mv_xor_chan *chan, static void mv_chan_activate(struct mv_xor_chan *chan) { - u32 activation; - dev_dbg(chan->device->common.dev, " activate chan.\n"); - activation = __raw_readl(XOR_ACTIVATION(chan)); - activation |= 0x1; - __raw_writel(activation, XOR_ACTIVATION(chan)); + + /* writel ensures all descriptors are flushed before activation */ + writel(BIT(0), XOR_ACTIVATION(chan)); } static char mv_chan_is_busy(struct mv_xor_chan *chan) |