Skip to content

Commit bbcc1c8

Browse files
kmaincentvinodkoul
authored andcommitted
dmaengine: dw-edma: eDMA: Add sync read before starting the DMA transfer in remote setup
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. In remote setup we can only use a readl to the memory to assure the full write has occurred. Fixes: 7e4b8a4 ("dmaengine: Add Synopsys eDMA IP version 0 support") Reviewed-by: Serge Semin <fancer.lancer@gmail.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> 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>
1 parent 712a92a commit bbcc1c8

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

drivers/dma/dw-edma/dw-edma-v0-core.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,20 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk)
346346
dw_edma_v0_write_ll_link(chunk, i, control, chunk->ll_region.paddr);
347347
}
348348

349+
static void dw_edma_v0_sync_ll_data(struct dw_edma_chunk *chunk)
350+
{
351+
/*
352+
* In case of remote eDMA engine setup, the DW PCIe RP/EP internal
353+
* configuration registers and application memory are normally accessed
354+
* over different buses. Ensure LL-data reaches the memory before the
355+
* doorbell register is toggled by issuing the dummy-read from the remote
356+
* LL memory in a hope that the MRd TLP will return only after the
357+
* last MWr TLP is completed
358+
*/
359+
if (!(chunk->chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL))
360+
readl(chunk->ll_region.vaddr.io);
361+
}
362+
349363
static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
350364
{
351365
struct dw_edma_chan *chan = chunk->chan;
@@ -412,6 +426,9 @@ static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
412426
SET_CH_32(dw, chan->dir, chan->id, llp.msb,
413427
upper_32_bits(chunk->ll_region.paddr));
414428
}
429+
430+
dw_edma_v0_sync_ll_data(chunk);
431+
415432
/* Doorbell */
416433
SET_RW_32(dw, chan->dir, doorbell,
417434
FIELD_PREP(EDMA_V0_DOORBELL_CH_MASK, chan->id));

0 commit comments

Comments
 (0)