lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit

Browse Source 
mx53_loco: fix deadlock report from sdma_tx_submit() during boot

BugLink: http://bugs.launchpad.net/bugs/878701

Adjust to use spin_lock_irqsave()/spin_unlock_irqresotre(), so to
make it safe when called from interrupt context.

Signed-off-by: Haitao Zhang <haitao.zhang@linaro.org>
Signed-off-by: Eric Miao <eric.miao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
Haitao Zhang
2012-01-01 11:30:06 +08:00
committed by Vinod Koul
parent e9f3a49c96
commit f69f2e264f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/dma/imx-sdma.c
View File

@@ -836,17 +836,18 @@ static struct sdma_channel *to_sdma_chan(struct dma_chan *chan)
static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx) static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx)
{ {
unsigned long flags;
struct sdma_channel *sdmac = to_sdma_chan(tx->chan); struct sdma_channel *sdmac = to_sdma_chan(tx->chan);
struct sdma_engine *sdma = sdmac->sdma; struct sdma_engine *sdma = sdmac->sdma;
dma_cookie_t cookie; dma_cookie_t cookie;
spin_lock_irq(&sdmac->lock); spin_lock_irqsave(&sdmac->lock, flags);
cookie = sdma_assign_cookie(sdmac); cookie = sdma_assign_cookie(sdmac);
sdma_enable_channel(sdma, sdmac->channel); sdma_enable_channel(sdma, sdmac->channel);
spin_unlock_irq(&sdmac->lock); spin_unlock_irqrestore(&sdmac->lock, flags);
return cookie; return cookie;
} }