From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: jianqi.ren.cn@windriver.com, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.1.y] dmaengine: dw-edma: eDMA: Add sync read before starting the DMA transfer in remote setup
Date: Fri, 6 Dec 2024 12:11:45 -0500 [thread overview]
Message-ID: <20241206095441-33232574ccf00444@stable.kernel.org> (raw)
In-Reply-To: <20241206032214.3089315-1-jianqi.ren.cn@windriver.com>
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: bbcc1c83f343e580c3aa1f2a8593343bf7b55bba
WARNING: Author mismatch between patch and upstream commit:
Backport author: <jianqi.ren.cn@windriver.com>
Commit author: Kory Maincent <kory.maincent@bootlin.com>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: d24fe6d5a1cf)
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: bbcc1c83f343e ! 1: da1ca4c28e390 dmaengine: dw-edma: eDMA: Add sync read before starting the DMA transfer in remote setup
@@ Metadata
## Commit message ##
dmaengine: dw-edma: eDMA: Add sync read before starting the DMA transfer in remote setup
+ [ Upstream commit bbcc1c83f343e580c3aa1f2a8593343bf7b55bba ]
+
The Linked list element and pointer are not stored in the same memory as
the eDMA controller register. If the doorbell register is toggled before
the full write of the linked list a race condition error will occur.
@@ Commit message
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Link: https://lore.kernel.org/r/20240129-b4-feature_hdma_mainline-v7-6-8e8c1acb7a46@bootlin.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
+ Signed-off-by: Jianqi Ren <jianqi.ren.cn@windriver.com>
## drivers/dma/dw-edma/dw-edma-v0-core.c ##
@@ drivers/dma/dw-edma/dw-edma-v0-core.c: static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk)
- dw_edma_v0_write_ll_link(chunk, i, control, chunk->ll_region.paddr);
+ #endif /* CONFIG_64BIT */
}
+static void dw_edma_v0_sync_ll_data(struct dw_edma_chunk *chunk)
@@ drivers/dma/dw-edma/dw-edma-v0-core.c: static void dw_edma_v0_core_write_chunk(s
+ * last MWr TLP is completed
+ */
+ if (!(chunk->chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL))
-+ readl(chunk->ll_region.vaddr.io);
++ readl(chunk->ll_region.vaddr);
+}
+
- static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
+ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
{
struct dw_edma_chan *chan = chunk->chan;
-@@ drivers/dma/dw-edma/dw-edma-v0-core.c: static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
+@@ drivers/dma/dw-edma/dw-edma-v0-core.c: void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
SET_CH_32(dw, chan->dir, chan->id, llp.msb,
upper_32_bits(chunk->ll_region.paddr));
}
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
next prev parent reply other threads:[~2024-12-06 17:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 3:22 [PATCH 6.1.y] dmaengine: dw-edma: eDMA: Add sync read before starting the DMA transfer in remote setup jianqi.ren.cn
2024-12-06 17:11 ` Sasha Levin [this message]
2024-12-11 8:15 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2024-12-11 10:04 jianqi.ren.cn
2024-12-11 16:32 ` Sasha Levin
2024-12-09 4:26 jianqi.ren.cn
2024-12-09 14:35 ` Sasha Levin
2024-12-05 9:37 jianqi.ren.cn
2024-12-05 13:33 ` Sasha Levin
2024-12-11 8:15 ` Greg KH
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=20241206095441-33232574ccf00444@stable.kernel.org \
--to=sashal@kernel.org \
--cc=jianqi.ren.cn@windriver.com \
--cc=stable@vger.kernel.org \
/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