linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 06/10] dma: imx-sdma: add terminate_all support
Date: Tue, 17 May 2016 12:48:52 +0900	[thread overview]
Message-ID: <1463456936-10634-7-git-send-email-jiada_wang@mentor.com> (raw)
In-Reply-To: <1463456936-10634-1-git-send-email-jiada_wang@mentor.com>

Implement device_terminate_all(), so that dmaengine_terminate_async()
can work.

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 drivers/dma/imx-sdma.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index ef5d37c..040cbf2 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1401,6 +1401,13 @@ static void sdma_issue_pending(struct dma_chan *chan)
 		sdma_enable_channel(sdma, sdmac->channel);
 }
 
+static int sdma_terminate_all(struct dma_chan *chan)
+{
+	sdma_disable_channel(chan);
+
+	return 0;
+}
+
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2	38
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	41
@@ -1819,6 +1826,7 @@ static int sdma_probe(struct platform_device *pdev)
 	sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
 	sdma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
 	sdma->dma_device.device_issue_pending = sdma_issue_pending;
+	sdma->dma_device.device_terminate_all = sdma_terminate_all;
 	sdma->dma_device.dev->dma_parms = &sdma->dma_parms;
 	dma_set_max_seg_size(sdma->dma_device.dev, 65535);
 
-- 
2.4.5

  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 ` Jiada Wang [this message]
2016-05-17  3:48 ` [PATCH 07/10] dma: imx-sdma: Add synchronization support Jiada Wang
2016-05-17  3:48 ` [PATCH 08/10] dma: imx-sdma: abort updating channel when it has been terminated Jiada Wang
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 06/10] dma: imx-sdma: add terminate_all support Jiada Wang
2016-05-16  8:37 [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-05-16  8:37 ` [PATCH 06/10] dma: imx-sdma: add terminate_all support 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-7-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).