linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: yibin.gong@nxp.com
To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org,
	s.hauer@pengutronix.de, kernel@pengutronix.de,
	broonie@kernel.org, festevam@gmail.com, vkoul@kernel.org,
	dan.j.williams@intel.com, u.kleine-koenig@pengutronix.de,
	catalin.marinas@arm.com, l.stach@pengutronix.de,
	will.deacon@arm.com
Cc: linux-spi@vger.kernel.org, linux-imx@nxp.com,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
	devicetree@vger.kernel.org
Subject: [PATCH v5 11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm
Date: Mon, 10 Jun 2019 16:17:49 +0800	[thread overview]
Message-ID: <20190610081753.11422-12-yibin.gong@nxp.com> (raw)
In-Reply-To: <20190610081753.11422-1-yibin.gong@nxp.com>

From: Robin Gong <yibin.gong@nxp.com>

Because the number of ecspi1 rx event on i.mx8mm is 0, the condition
check ignore such special case without dma channel enabled, which caused
ecspi1 rx works failed. Actually, no need to check event_id0/event_id1
and replace checking 'event_id1' with 'DMA_DEV_TO_DEV', so that configure
event_id1 only in case DEV_TO_DEV.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 525ca89..f7c150d 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1202,7 +1202,7 @@ static int sdma_config_channel(struct dma_chan *chan)
 	if ((sdmac->peripheral_type != IMX_DMATYPE_MEMORY) &&
 			(sdmac->peripheral_type != IMX_DMATYPE_DSP)) {
 		/* Handle multiple event channels differently */
-		if (sdmac->event_id1) {
+		if (sdmac->direction == DMA_DEV_TO_DEV) {
 			if (sdmac->peripheral_type == IMX_DMATYPE_ASRC_SP ||
 			    sdmac->peripheral_type == IMX_DMATYPE_ASRC)
 				sdma_set_watermarklevel_for_p2p(sdmac);
@@ -1370,9 +1370,9 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
 	sdma_channel_synchronize(chan);
 
-	if (sdmac->event_id0)
-		sdma_event_disable(sdmac, sdmac->event_id0);
-	if (sdmac->event_id1)
+	sdma_event_disable(sdmac, sdmac->event_id0);
+
+	if (sdmac->direction == DMA_DEV_TO_DEV)
 		sdma_event_disable(sdmac, sdmac->event_id1);
 
 	sdmac->event_id0 = 0;
@@ -1670,13 +1670,11 @@ static int sdma_config(struct dma_chan *chan,
 	memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg));
 
 	/* Set ENBLn earlier to make sure dma request triggered after that */
-	if (sdmac->event_id0) {
-		if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)
-			return -EINVAL;
-		sdma_event_enable(sdmac, sdmac->event_id0);
-	}
+	if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)
+		return -EINVAL;
+	sdma_event_enable(sdmac, sdmac->event_id0);
 
-	if (sdmac->event_id1) {
+	if (sdmac->direction == DMA_DEV_TO_DEV) {
 		if (sdmac->event_id1 >= sdmac->sdma->drvdata->num_events)
 			return -EINVAL;
 		sdma_event_enable(sdmac, sdmac->event_id1);
-- 
2.7.4


  parent reply	other threads:[~2019-06-10  8:16 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-10  8:17 [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family yibin.gong
2019-06-10  8:17 ` [PATCH v5 01/15] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" yibin.gong
2019-06-10  8:17 ` [PATCH v5 02/15] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" yibin.gong
2019-06-10  8:17 ` [PATCH v5 03/15] Revert "dmaengine: imx-sdma: refine to load context only once" yibin.gong
2019-06-10  8:17 ` [PATCH v5 04/15] dmaengine: imx-sdma: remove dupilicated sdma_load_context yibin.gong
2019-06-10  8:17 ` [PATCH v5 05/15] dmaengine: imx-sdma: add mcu_2_ecspi script yibin.gong
2019-06-10  8:17 ` [PATCH v5 06/15] spi: imx: fix ERR009165 yibin.gong
2019-06-10  8:17 ` [PATCH v5 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul yibin.gong
2019-06-10  8:17 ` [PATCH v5 08/15] spi: imx: add new i.mx6ul compatible name in binding doc yibin.gong
2019-07-09  2:17   ` Rob Herring
2019-06-10  8:17 ` [PATCH v5 09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul yibin.gong
2019-06-10  8:17 ` [PATCH v5 10/15] dma: imx-sdma: add i.mx6ul/6sx compatible name yibin.gong
2019-06-11 22:35   ` Rob Herring
2019-06-12  2:32     ` Robin Gong
2019-06-10  8:17 ` yibin.gong [this message]
2019-09-24 13:27   ` [PATCH v5 11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Schrempf Frieder
2019-09-25 11:26     ` Robin Gong
2019-09-25 14:53       ` Schrempf Frieder
2019-09-27  1:55         ` Robin Gong
2020-02-06 10:17           ` Schrempf Frieder
2020-02-10 12:28             ` Robin Gong
2019-06-10  8:17 ` [PATCH v5 12/15] ARM: dts: imx6ul: add dma support on ecspi yibin.gong
2019-07-17  6:42   ` Shawn Guo
2019-07-23  9:39     ` Robin Gong
2019-07-24  0:48       ` Shawn Guo
2019-07-24  1:53         ` Robin Gong
2019-09-24  9:53           ` Robin Gong
2019-06-10  8:17 ` [PATCH v5 13/15] ARM: dts: imx6sll: correct sdma compatible yibin.gong
2019-07-17  6:42   ` Shawn Guo
2019-06-10  8:17 ` [PATCH v5 14/15] arm64: defconfig: Enable SDMA on i.mx8mq/8mm yibin.gong
2019-07-17  6:48   ` Shawn Guo
2019-06-10  8:17 ` [PATCH v5 15/15] dmaengine: imx-sdma: add uart rom script yibin.gong
2019-06-10 12:55   ` Vinod Koul
2019-06-11  3:04     ` Robin Gong
2019-06-11  4:37       ` Vinod Koul
2019-06-21  8:42 ` [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-06-24  0:16   ` Shawn Guo
2019-06-25  8:05     ` Robin Gong

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=20190610081753.11422-12-yibin.gong@nxp.com \
    --to=yibin.gong@nxp.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dan.j.williams@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=l.stach@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --cc=vkoul@kernel.org \
    --cc=will.deacon@arm.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).