From: Jiada Wang <jiada_wang@mentor.com>
To: <vinod.koul@intel.com>, <dan.j.williams@intel.com>
Cc: <dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<shawnguo@kernel.org>, <kernel@pengutronix.de>,
<george_davis@mentor.com>, <jiada_wang@mentor.com>
Subject: [PATCH 08/10] dma: imx-sdma: abort updating channel when it has been terminated
Date: Tue, 17 May 2016 12:48:54 +0900 [thread overview]
Message-ID: <1463456936-10634-9-git-send-email-jiada_wang@mentor.com> (raw)
In-Reply-To: <1463456936-10634-1-git-send-email-jiada_wang@mentor.com>
In case the corresponding channel has already been terminated,
then instead of go on updating channel status, driver should abort from
sdma_handle_channel_loop(), otherwise channel status will be updated
incorrecly.
This patch also adds lock to avoid race between terminate of channel,
and updaing of channel status in sdma_handle_channel_loop().
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
drivers/dma/imx-sdma.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 0b23407..bc867e5 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -664,16 +664,25 @@ static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int event)
static void sdma_handle_channel_loop(struct sdma_channel *sdmac)
{
struct sdma_buffer_descriptor *bd;
+ unsigned long flags;
/*
* loop mode. Iterate over descriptors, re-setup them and
* call callback function.
*/
while (1) {
+ spin_lock_irqsave(&sdmac->lock, flags);
+ if (!sdmac->enabled) {
+ spin_unlock_irqrestore(&sdmac->lock, flags);
+ break;
+ }
+
bd = &sdmac->bd[sdmac->buf_tail];
- if (bd->mode.status & BD_DONE)
+ if (bd->mode.status & BD_DONE) {
+ spin_unlock_irqrestore(&sdmac->lock, flags);
break;
+ }
if (bd->mode.status & BD_RROR)
sdmac->status = DMA_ERROR;
@@ -690,6 +699,7 @@ static void sdma_handle_channel_loop(struct sdma_channel *sdmac)
bd->mode.count = sdmac->chn_count;
}
+ spin_unlock_irqrestore(&sdmac->lock, flags);
if (sdmac->desc.callback)
sdmac->desc.callback(sdmac->desc.callback_param);
}
--
2.4.5
next prev parent reply other threads:[~2016-05-17 3:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 3:48 [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-05-17 3:48 ` [PATCH 01/10] dma: imx-sdma: use chn_real_count to report residue for UART Jiada Wang
2016-05-17 3:48 ` [PATCH 02/10] dma: imx-sdma: don't update BD in isr routine Jiada Wang
2016-05-17 3:48 ` [PATCH 03/10] dma: imx-sdma: clear BD_RROR flag before pass it to sdma script Jiada Wang
2016-05-17 3:48 ` [PATCH 04/10] dma: imx-sdma: update sdma channel status for cyclic dma Jiada Wang
2016-05-17 3:48 ` [PATCH 05/10] dma: imx-sdma: add flag to indicate SDMA channel state Jiada Wang
2016-05-17 3:48 ` [PATCH 06/10] dma: imx-sdma: add terminate_all support Jiada Wang
2016-05-17 3:48 ` [PATCH 07/10] dma: imx-sdma: Add synchronization support Jiada Wang
2016-05-17 3:48 ` Jiada Wang [this message]
2016-05-17 3:48 ` [PATCH 09/10] dma: imx-sdma: disable channel 0 when it timeouts Jiada Wang
2016-05-17 3:48 ` [PATCH 10/10] dma: imx-sdma: clear channel0 interrupt bit in irq routine Jiada Wang
2016-10-12 5:54 ` [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-10-17 4:51 ` Jiada Wang
2016-10-17 5:34 ` Vinod Koul
2016-10-17 7:39 ` Jiada Wang
-- strict thread matches above, loose matches on Subject: below --
2016-05-17 3:47 Jiada Wang
2016-05-17 3:47 ` [PATCH 08/10] dma: imx-sdma: abort updating channel when it has been terminated Jiada Wang
2016-05-16 8:37 [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-05-16 8:37 ` [PATCH 08/10] dma: imx-sdma: abort updating channel when it has been terminated Jiada Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463456936-10634-9-git-send-email-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=george_davis@mentor.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=shawnguo@kernel.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).