Skip to content

Commit 6b1ba3f

Browse files
Christophe Kerellostorulf
authored andcommitted
mmc: mmci: stm32: fix DMA API overlapping mappings warning
Turning on CONFIG_DMA_API_DEBUG_SG results in the following warning: DMA-API: mmci-pl18x 48220000.mmc: cacheline tracking EEXIST, overlapping mappings aren't supported WARNING: CPU: 1 PID: 51 at kernel/dma/debug.c:568 add_dma_entry+0x234/0x2f4 Modules linked in: CPU: 1 PID: 51 Comm: kworker/1:2 Not tainted 6.1.28 #1 Hardware name: STMicroelectronics STM32MP257F-EV1 Evaluation Board (DT) Workqueue: events_freezable mmc_rescan Call trace: add_dma_entry+0x234/0x2f4 debug_dma_map_sg+0x198/0x350 __dma_map_sg_attrs+0xa0/0x110 dma_map_sg_attrs+0x10/0x2c sdmmc_idma_prep_data+0x80/0xc0 mmci_prep_data+0x38/0x84 mmci_start_data+0x108/0x2dc mmci_request+0xe4/0x190 __mmc_start_request+0x68/0x140 mmc_start_request+0x94/0xc0 mmc_wait_for_req+0x70/0x100 mmc_send_tuning+0x108/0x1ac sdmmc_execute_tuning+0x14c/0x210 mmc_execute_tuning+0x48/0xec mmc_sd_init_uhs_card.part.0+0x208/0x464 mmc_sd_init_card+0x318/0x89c mmc_attach_sd+0xe4/0x180 mmc_rescan+0x244/0x320 DMA API debug brings to light leaking dma-mappings as dma_map_sg and dma_unmap_sg are not correctly balanced. If an error occurs in mmci_cmd_irq function, only mmci_dma_error function is called and as this API is not managed on stm32 variant, dma_unmap_sg is never called in this error path. Signed-off-by: Christophe Kerello <[email protected]> Fixes: 46b723d ("mmc: mmci: add stm32 sdmmc variant") Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent ff3206d commit 6b1ba3f

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

drivers/mmc/host/mmci_stm32_sdmmc.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ static int sdmmc_idma_start(struct mmci_host *host, unsigned int *datactrl)
225225
struct scatterlist *sg;
226226
int i;
227227

228+
host->dma_in_progress = true;
229+
228230
if (!host->variant->dma_lli || data->sg_len == 1 ||
229231
idma->use_bounce_buffer) {
230232
u32 dma_addr;
@@ -263,9 +265,30 @@ static int sdmmc_idma_start(struct mmci_host *host, unsigned int *datactrl)
263265
return 0;
264266
}
265267

268+
static void sdmmc_idma_error(struct mmci_host *host)
269+
{
270+
struct mmc_data *data = host->data;
271+
struct sdmmc_idma *idma = host->dma_priv;
272+
273+
if (!dma_inprogress(host))
274+
return;
275+
276+
writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR);
277+
host->dma_in_progress = false;
278+
data->host_cookie = 0;
279+
280+
if (!idma->use_bounce_buffer)
281+
dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
282+
mmc_get_dma_dir(data));
283+
}
284+
266285
static void sdmmc_idma_finalize(struct mmci_host *host, struct mmc_data *data)
267286
{
287+
if (!dma_inprogress(host))
288+
return;
289+
268290
writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR);
291+
host->dma_in_progress = false;
269292

270293
if (!data->host_cookie)
271294
sdmmc_idma_unprep_data(host, data, 0);
@@ -676,6 +699,7 @@ static struct mmci_host_ops sdmmc_variant_ops = {
676699
.dma_setup = sdmmc_idma_setup,
677700
.dma_start = sdmmc_idma_start,
678701
.dma_finalize = sdmmc_idma_finalize,
702+
.dma_error = sdmmc_idma_error,
679703
.set_clkreg = mmci_sdmmc_set_clkreg,
680704
.set_pwrreg = mmci_sdmmc_set_pwrreg,
681705
.busy_complete = sdmmc_busy_complete,

0 commit comments

Comments
 (0)