[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120103084330.GG5446@pengutronix.de>
Date: Tue, 3 Jan 2012 09:43:30 +0100
From: Sascha Hauer <s.hauer@...gutronix.de>
To: Richard Zhao <richard.zhao@...aro.org>
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
kernel@...gutronix.de, shawn.guo@...aro.org, vinod.koul@...el.com,
dan.j.williams@...el.com, eric.miao@...aro.org, patches@...aro.org,
Haitao Zhang <minipanda@...uxrobot.org>,
Haitao Zhang <haitao.zhang@...aro.org>
Subject: Re: [PATCH] dma/imx-sdma: save irq flags when use spin_lock in
sdma_tx_submit
On Sun, Jan 01, 2012 at 11:30:06AM +0800, Richard Zhao wrote:
> From: Haitao Zhang <minipanda@...uxrobot.org>
Acked-by: Sascha Hauer <s.hauer@...gutronix.de>
>
> 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@...aro.org>
> Signed-off-by: Eric Miao <eric.miao@...aro.org>
> Signed-off-by: Richard Zhao <richard.zhao@...aro.org>
> ---
> 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 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists