diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-12-14 11:06:58 +0000 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-28 01:44:46 -0800 |
| commit | 2b99c2592167eb1043e16d1e7187afdc7c940a41 (patch) | |
| tree | afeb11ea46e527befcd07b956596ea8cf8c18585 /drivers/dma | |
| parent | 2518d1d1fc0ba7ef781bac97132bcfd6d7466c4b (diff) | |
| download | op-kernel-dev-2b99c2592167eb1043e16d1e7187afdc7c940a41.zip op-kernel-dev-2b99c2592167eb1043e16d1e7187afdc7c940a41.tar.gz | |
DMAEngine: sirf: lock the shared registers access in sirfsoc_dma_terminate_all
Just like Russell pointed out in "DMAEngine: sirf: add DMA
pause/resume support" at
http://www.spinics.net/lists/arm-kernel/msg212496.html
here I find sirfsoc_dma_terminate_all() has same problem,
so move the locking to the front of registers access.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/sirf-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index 7d78cf7..fb5790d 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c @@ -291,6 +291,8 @@ static int sirfsoc_dma_terminate_all(struct sirfsoc_dma_chan *schan) int cid = schan->chan.chan_id; unsigned long flags; + spin_lock_irqsave(&schan->lock, flags); + if (!sdma->is_marco) { writel_relaxed(readl_relaxed(sdma->base + SIRFSOC_DMA_INT_EN) & ~(1 << cid), sdma->base + SIRFSOC_DMA_INT_EN); @@ -305,9 +307,9 @@ static int sirfsoc_dma_terminate_all(struct sirfsoc_dma_chan *schan) writel_relaxed(1 << cid, sdma->base + SIRFSOC_DMA_CH_VALID); - spin_lock_irqsave(&schan->lock, flags); list_splice_tail_init(&schan->active, &schan->free); list_splice_tail_init(&schan->queued, &schan->free); + spin_unlock_irqrestore(&schan->lock, flags); return 0; |
