All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robin Gong <yibin.gong@nxp.com>
To: "robh@kernel.org" <robh@kernel.org>,
	"broonie@kernel.org" <broonie@kernel.org>,
	"shawnguo@kernel.org" <shawnguo@kernel.org>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"festevam@gmail.com" <festevam@gmail.com>,
	"mark.rutland@arm.com" <mark.rutland@arm.com>,
	"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
	"plyatov@gmail.com" <plyatov@gmail.com>,
	"vkoul@kernel.org" <vkoul@kernel.org>,
	"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
	"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
	"will.deacon@arm.com" <will.deacon@arm.com>,
	"l.stach@pengutronix.de" <l.stach@pengutronix.de>
Cc: dl-linux-imx <linux-imx@nxp.com>,
	"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>
Subject: [PATCH v3 03/14] Revert "dmaengine: imx-sdma: refine to load context only once"
Date: Tue, 7 May 2019 09:15:53 +0000	[thread overview]
Message-ID: <1557249513-4903-4-git-send-email-yibin.gong@nxp.com> (raw)
In-Reply-To: <1557249513-4903-1-git-send-email-yibin.gong@nxp.com>

This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because
in spi-imx case, burst length may be changed dynamically.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
 drivers/dma/imx-sdma.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 99d9f43..407a56e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -377,7 +377,6 @@ struct sdma_channel {
 	unsigned long			watermark_level;
 	u32				shp_addr, per_addr;
 	enum dma_status			status;
-	bool				context_loaded;
 	struct imx_dma_data		data;
 	struct work_struct		terminate_worker;
 };
@@ -988,9 +987,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 	int ret;
 	unsigned long flags;
 
-	if (sdmac->context_loaded)
-		return 0;
-
 	if (sdmac->direction == DMA_DEV_TO_MEM)
 		load_address = sdmac->pc_from_device;
 	else if (sdmac->direction == DMA_DEV_TO_DEV)
@@ -1033,8 +1029,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 
 	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
-	sdmac->context_loaded = true;
-
 	return ret;
 }
 
@@ -1074,7 +1068,6 @@ static void sdma_channel_terminate_work(struct work_struct *work)
 	sdmac->desc = NULL;
 	spin_unlock_irqrestore(&sdmac->vc.lock, flags);
 	vchan_dma_desc_free_list(&sdmac->vc, &head);
-	sdmac->context_loaded = false;
 }
 
 static int sdma_disable_channel_async(struct dma_chan *chan)
-- 
2.7.4


WARNING: multiple messages have this Message-ID (diff)
From: Robin Gong <yibin.gong@nxp.com>
To: "robh@kernel.org" <robh@kernel.org>,
	"broonie@kernel.org" <broonie@kernel.org>,
	"shawnguo@kernel.org" <shawnguo@kernel.org>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"festevam@gmail.com" <festevam@gmail.com>,
	"mark.rutland@arm.com" <mark.rutland@arm.com>,
	"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
	"plyatov@gmail.com" <plyatov@gmail.com>,
	"vkoul@kernel.org" <vkoul@kernel.org>,
	"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
	"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
	"will.deacon@arm.com" <will.deacon@arm.com>,
	"l.stach@pengutronix.de" <l.stach@pengutronix.de>
Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
	dl-linux-imx <linux-imx@nxp.com>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>,
	"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v3 03/14] Revert "dmaengine: imx-sdma: refine to load context only once"
Date: Tue, 7 May 2019 09:15:53 +0000	[thread overview]
Message-ID: <1557249513-4903-4-git-send-email-yibin.gong@nxp.com> (raw)
In-Reply-To: <1557249513-4903-1-git-send-email-yibin.gong@nxp.com>

This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because
in spi-imx case, burst length may be changed dynamically.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
 drivers/dma/imx-sdma.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 99d9f43..407a56e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -377,7 +377,6 @@ struct sdma_channel {
 	unsigned long			watermark_level;
 	u32				shp_addr, per_addr;
 	enum dma_status			status;
-	bool				context_loaded;
 	struct imx_dma_data		data;
 	struct work_struct		terminate_worker;
 };
@@ -988,9 +987,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 	int ret;
 	unsigned long flags;
 
-	if (sdmac->context_loaded)
-		return 0;
-
 	if (sdmac->direction == DMA_DEV_TO_MEM)
 		load_address = sdmac->pc_from_device;
 	else if (sdmac->direction == DMA_DEV_TO_DEV)
@@ -1033,8 +1029,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 
 	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
-	sdmac->context_loaded = true;
-
 	return ret;
 }
 
@@ -1074,7 +1068,6 @@ static void sdma_channel_terminate_work(struct work_struct *work)
 	sdmac->desc = NULL;
 	spin_unlock_irqrestore(&sdmac->vc.lock, flags);
 	vchan_dma_desc_free_list(&sdmac->vc, &head);
-	sdmac->context_loaded = false;
 }
 
 static int sdma_disable_channel_async(struct dma_chan *chan)
-- 
2.7.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-05-07  9:16 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-07  9:15 [PATCH v3 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-05-07  9:15 ` Robin Gong
2019-05-07  9:15 ` Robin Gong
2019-05-07  9:15 ` [PATCH v3 01/14] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2019-05-07  9:15   ` Robin Gong
2019-05-07  9:15   ` Robin Gong
2019-05-07  9:15 ` [PATCH v3 02/14] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2019-05-07  9:15   ` Robin Gong
2019-05-07  9:15   ` Robin Gong
2019-05-07  9:15 ` Robin Gong [this message]
2019-05-07  9:15   ` [PATCH v3 03/14] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2019-05-07  9:15   ` Robin Gong
2019-05-07  9:16 ` [PATCH v3 04/14] dmaengine: imx-sdma: remove dupilicated sdma_load_context Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-21  4:15   ` Vinod Koul
2019-05-21  4:15     ` Vinod Koul
2019-05-21  4:15     ` Vinod Koul
2019-05-07  9:16 ` [PATCH v3 05/14] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-21  4:16   ` Vinod Koul
2019-05-21  4:16     ` Vinod Koul
2019-05-21  4:16     ` Vinod Koul
2019-05-07  9:16 ` [PATCH v3 06/14] spi: imx: fix ERR009165 Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-12  9:16   ` Mark Brown
2019-05-12  9:16     ` Mark Brown
2019-05-12  9:16     ` Mark Brown
2019-05-07  9:16 ` [PATCH v3 07/14] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-12  9:17   ` Mark Brown
2019-05-12  9:17     ` Mark Brown
2019-05-12  9:17     ` Mark Brown
2019-05-07  9:16 ` [PATCH v3 08/14] dt-bindings: spi: imx: add new i.mx6ul compatible name Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-12  9:17   ` Mark Brown
2019-05-12  9:17     ` Mark Brown
2019-05-12  9:17     ` Mark Brown
2019-05-13 17:26   ` Rob Herring
2019-05-13 17:26     ` Rob Herring
2019-05-13 17:26     ` Rob Herring
2019-05-13 17:26     ` Rob Herring
2019-05-07  9:16 ` [PATCH v3 09/14] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-21  4:17   ` Vinod Koul
2019-05-21  4:17     ` Vinod Koul
2019-05-21  4:17     ` Vinod Koul
2019-05-07  9:16 ` [PATCH v3 10/14] dt-bindings: dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07 16:56   ` Rob Herring
2019-05-07 16:56     ` Rob Herring
2019-05-07 16:56     ` Rob Herring
2019-05-07 16:56     ` Rob Herring
2019-05-08  9:47     ` [EXT] " Robin Gong
2019-05-08  9:47       ` Robin Gong
2019-05-08  9:47       ` Robin Gong
2019-05-07  9:16 ` [PATCH v3 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-21  4:18   ` Vinod Koul
2019-05-21  4:18     ` Vinod Koul
2019-05-21  4:18     ` Vinod Koul
2019-05-07  9:16 ` [PATCH v3 12/14] ARM: dts: imx6ul: add dma support on ecspi Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16 ` [PATCH v3 13/14] ARM: dts: imx6sll: correct sdma compatible Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:16   ` Robin Gong
2019-05-07  9:17 ` [PATCH v3 14/14] arm64: defconfig: Enable SDMA on i.mx8mq/8mm Robin Gong
2019-05-07  9:17   ` Robin Gong
2019-05-07  9:17   ` Robin Gong
2019-05-13  9:31 ` [PATCH v3 00/14] add ecspi ERR009165 for i.mx6/7 soc family Lucas Stach
2019-05-13  9:31   ` Lucas Stach
2019-05-13  9:31   ` Lucas Stach
2019-05-17  9:54   ` [EXT] " Robin Gong
2019-05-17  9:54     ` Robin Gong
2019-05-17  9:54     ` 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=1557249513-4903-4-git-send-email-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=plyatov@gmail.com \
    --cc=robh@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.