From: Robin Gong <yibin.gong@nxp.com> To: mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, vkoul@kernel.org, will.deacon@arm.com, shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de, martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de, dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com, frieder.schrempf@kontron.de, r.schwebel@pengutronix.de Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, dmaengine@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH v12 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Date: Tue, 11 Aug 2020 23:53:42 +0800 [thread overview] Message-ID: <1597161231-32303-4-git-send-email-yibin.gong@nxp.com> (raw) In-Reply-To: <1597161231-32303-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> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/dma/imx-sdma.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 270992c..d305b80 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; }; @@ -984,9 +983,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) @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) vchan_get_all_descriptors(&sdmac->vc, &head); spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_terminate_all(struct dma_chan *chan) @@ -1337,7 +1330,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) sdmac->event_id0 = 0; sdmac->event_id1 = 0; - sdmac->context_loaded = false; sdma_set_channel_priority(sdmac, 0); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Robin Gong <yibin.gong@nxp.com> To: mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, vkoul@kernel.org, will.deacon@arm.com, shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de, martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de, dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com, frieder.schrempf@kontron.de, r.schwebel@pengutronix.de Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v12 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Date: Tue, 11 Aug 2020 23:53:42 +0800 [thread overview] Message-ID: <1597161231-32303-4-git-send-email-yibin.gong@nxp.com> (raw) In-Reply-To: <1597161231-32303-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> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/dma/imx-sdma.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 270992c..d305b80 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; }; @@ -984,9 +983,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) @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) vchan_get_all_descriptors(&sdmac->vc, &head); spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_terminate_all(struct dma_chan *chan) @@ -1337,7 +1330,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) sdmac->event_id0 = 0; sdmac->event_id1 = 0; - sdmac->context_loaded = false; sdma_set_channel_priority(sdmac, 0); -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-08-11 7:40 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-11 15:53 [PATCH v12 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` Robin Gong [this message] 2020-08-11 15:53 ` [PATCH v12 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong 2020-08-17 5:38 ` Richard Leitner 2020-08-17 5:38 ` Richard Leitner 2020-08-11 15:53 ` [PATCH v12 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-17 5:38 ` Richard Leitner 2020-08-17 5:38 ` Richard Leitner 2020-08-11 15:53 ` [PATCH v12 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 07/12] spi: imx: fix ERR009165 Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 09/12] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 10/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 11/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong 2020-08-11 15:53 ` Robin Gong 2020-08-11 15:53 ` [PATCH v12 12/12] dmaengine: imx-sdma: add uart rom script Robin Gong 2020-08-11 15:53 ` 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=1597161231-32303-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=frieder.schrempf@kontron.de \ --cc=kernel@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=martin.fuzzey@flowbird.group \ --cc=matthias.schiffer@ew.tq-group.com \ --cc=r.schwebel@pengutronix.de \ --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: linkBe 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.