Skip to content

Commit 712a92a

Browse files
kmaincentvinodkoul
authored andcommitted
dmaengine: dw-edma: HDMA: 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 HDMA 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: e74c395 ("dmaengine: dw-edma: Add support for native HDMA") 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-5-8e8c1acb7a46@bootlin.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent e2f6a57 commit 712a92a

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,20 @@ static void dw_hdma_v0_core_write_chunk(struct dw_edma_chunk *chunk)
222222
dw_hdma_v0_write_ll_link(chunk, i, control, chunk->ll_region.paddr);
223223
}
224224

225+
static void dw_hdma_v0_sync_ll_data(struct dw_edma_chunk *chunk)
226+
{
227+
/*
228+
* In case of remote HDMA engine setup, the DW PCIe RP/EP internal
229+
* configuration registers and application memory are normally accessed
230+
* over different buses. Ensure LL-data reaches the memory before the
231+
* doorbell register is toggled by issuing the dummy-read from the remote
232+
* LL memory in a hope that the MRd TLP will return only after the
233+
* last MWr TLP is completed
234+
*/
235+
if (!(chunk->chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL))
236+
readl(chunk->ll_region.vaddr.io);
237+
}
238+
225239
static void dw_hdma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
226240
{
227241
struct dw_edma_chan *chan = chunk->chan;
@@ -252,6 +266,9 @@ static void dw_hdma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
252266
/* Set consumer cycle */
253267
SET_CH_32(dw, chan->dir, chan->id, cycle_sync,
254268
HDMA_V0_CONSUMER_CYCLE_STAT | HDMA_V0_CONSUMER_CYCLE_BIT);
269+
270+
dw_hdma_v0_sync_ll_data(chunk);
271+
255272
/* Doorbell */
256273
SET_CH_32(dw, chan->dir, chan->id, doorbell, HDMA_V0_DOORBELL_START);
257274
}

0 commit comments

Comments
 (0)