This is a note to let you know that I've just added the patch titled
dmaengine: imx-sdma: remove duplicated sdma_load_context
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
dmaengine-imx-sdma-remove-duplicated-sdma_load_context.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e555a03b112838883fdd8185d613c35d043732f2 Mon Sep 17 00:00:00 2001
From: Robin Gong <yibin.gong@xxxxxxx>
Date: Wed, 14 Jul 2021 18:20:44 +0800
Subject: dmaengine: imx-sdma: remove duplicated sdma_load_context
From: Robin Gong <yibin.gong@xxxxxxx>
commit e555a03b112838883fdd8185d613c35d043732f2 upstream.
Since sdma_transfer_init() will do sdma_load_context before any
sdma transfer, no need once more in sdma_config_channel().
Fixes: ad0d92d7ba6a ("dmaengine: imx-sdma: refine to load context only once")
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Robin Gong <yibin.gong@xxxxxxx>
Acked-by: Vinod Koul <vkoul@xxxxxxxxxx>
Tested-by: Richard Leitner <richard.leitner@xxxxxxxxxxx>
Signed-off-by: Shawn Guo <shawnguo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/dma/imx-sdma.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1161,7 +1161,6 @@ static void sdma_set_watermarklevel_for_
static int sdma_config_channel(struct dma_chan *chan)
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
- int ret;
sdma_disable_channel(chan);
@@ -1201,9 +1200,7 @@ static int sdma_config_channel(struct dm
sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */
}
- ret = sdma_load_context(sdmac);
-
- return ret;
+ return 0;
}
static int sdma_set_channel_priority(struct sdma_channel *sdmac,
Patches currently in stable-queue which might be from yibin.gong@xxxxxxx are
queue-5.14/revert-dmaengine-imx-sdma-refine-to-load-context-only-once.patch
queue-5.14/dmaengine-imx-sdma-remove-duplicated-sdma_load_context.patch
