From mboxrd@z Thu Jan 1 00:00:00 1970 From: s.hauer@pengutronix.de (Sascha Hauer) Date: Tue, 3 Jan 2012 09:43:30 +0100 Subject: [PATCH] dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit In-Reply-To: <1325388606-20732-1-git-send-email-richard.zhao@linaro.org> References: <1325388606-20732-1-git-send-email-richard.zhao@linaro.org> Message-ID: <20120103084330.GG5446@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Jan 01, 2012 at 11:30:06AM +0800, Richard Zhao wrote: > From: Haitao Zhang Acked-by: Sascha Hauer > > 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 > Signed-off-by: Eric Miao > Signed-off-by: Richard Zhao > --- > drivers/dma/imx-sdma.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index f993955..2b7a88b 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -832,17 +832,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) > { > + unsigned long flags; > struct sdma_channel *sdmac = to_sdma_chan(tx->chan); > struct sdma_engine *sdma = sdmac->sdma; > dma_cookie_t cookie; > > - spin_lock_irq(&sdmac->lock); > + spin_lock_irqsave(&sdmac->lock, flags); > > cookie = sdma_assign_cookie(sdmac); > > sdma_enable_channel(sdma, sdmac->channel); > > - spin_unlock_irq(&sdmac->lock); > + spin_unlock_irqrestore(&sdmac->lock, flags); > > return cookie; > } > -- > 1.7.4.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |