From: Barry Song Date: Fri, 14 Dec 2012 11:06:58 +0000 (+0000) Subject: DMAEngine: sirf: lock the shared registers access in sirfsoc_dma_terminate_all X-Git-Tag: upstream/snapshot3+hdmi~5581^2~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b99c2592167eb1043e16d1e7187afdc7c940a41;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Cc: Russell King Signed-off-by: Vinod Koul --- 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;