[ 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@xxxxxxxxxxxxx>
Commit author: Kory Maincent <kory.maincent@xxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.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: 9152d76cc2fe0 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@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240129-b4-feature_hdma_mainline-v7-6-8e8c1acb7a46@xxxxxxxxxxx
Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
+ Signed-off-by: Jianqi Ren <jianqi.ren.cn@xxxxxxxxxxxxx>
## 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
+ readl(chunk->ll_region.vaddr.io);
+}
+
- 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 | Failed |
Build Errors:
Build error for stable/linux-6.1.y:
drivers/dma/dw-edma/dw-edma-v0-core.c: In function 'dw_edma_v0_sync_ll_data':
drivers/dma/dw-edma/dw-edma-v0-core.c:371:45: error: request for member 'io' in something not a structure or union
371 | readl(chunk->ll_region.vaddr.io);
| ^
make[4]: *** [scripts/Makefile.build:250: drivers/dma/dw-edma/dw-edma-v0-core.o] Error 1
make[4]: Target 'drivers/dma/dw-edma/' not remade because of errors.
make[3]: *** [scripts/Makefile.build:503: drivers/dma/dw-edma] Error 2
make[3]: Target 'drivers/dma/' not remade because of errors.
make[2]: *** [scripts/Makefile.build:503: drivers/dma] Error 2
make[2]: Target 'drivers/' not remade because of errors.
make[1]: *** [scripts/Makefile.build:503: drivers] Error 2
make[1]: Target './' not remade because of errors.
make: *** [Makefile:2009: .] Error 2
make: Target '__all' not remade because of errors.
