From nobody Fri Dec 19 20:11:55 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 774A565BC8; Wed, 13 Mar 2024 16:46:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348406; cv=none; b=iVs7Lbz98zeG36656OCGKba9vGGSbF5JDwRtCPsJzLI3ScX6ztt76I6NOZSKCCOkSZ7uIQElkPj2rmrstvhwwiINlIT5D3MBB2irz6VBxnO1bOo6ZNTeJywlYE4bAaxU9WOh2ZiFN3J4Tpi9FAu061hZ93Zk5SBGv2MJY6LaMf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348406; c=relaxed/simple; bh=BKKvaSPOJcIzN9AKZ4t/6eH1vXhiFpdAhQlKssnCZxE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z71vep2EiVsb2kFwKSdmnxQ959oqpXzCKe6VgIn72JxMBOD9PSilPAXkpTQjGqWtdTj23XO5pN5p8erUSie6cF4ABMVOPsu+OeuekiWMpTLhoOvHuDKlCODbPp/C5bFkEq6vqE2dEb4Ur5g3vlkWUZ2xXmIejTe/7hGuopBEOBA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TlYb+PHe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TlYb+PHe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8573C43390; Wed, 13 Mar 2024 16:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348405; bh=BKKvaSPOJcIzN9AKZ4t/6eH1vXhiFpdAhQlKssnCZxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlYb+PHeSLuicUVvd7XTWy3OmSljCScnJzsnXrEK2nxMJQFltelnMC10e+Jy/z1pT 8jxBXulUFOkayYx16mQLWtugj2bOQYUFyj8S1Jlb2a0o3yk8VY0QZRORHAUmnRAaPs rbHjJNI7Jk2KkmWimaOCFkyRYL58ixIGlnw3wRjr0vdErsdeMvP1vNqSAh48HF5mBw /izNYE4ggDMI46vUOQm/UYCCq7Ff0DzuIj+kxzbFo3bmk3twjoc/6veI5o8e35V1xB np1yHF/jRk+eCd/mRBQQijn3YNCaMdLEZ0tk6k3WFEFwGF5nKqhBZCCHLKA1eQkanT Nw8PxT9429TKQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Kerello , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 02/73] mmc: mmci: stm32: fix DMA API overlapping mappings warning Date: Wed, 13 Mar 2024 12:45:29 -0400 Message-ID: <20240313164640.616049-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313164640.616049-1-sashal@kernel.org> References: <20240313164640.616049-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.213-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.213-rc1 X-KernelTest-Deadline: 2024-03-15T16:46+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christophe Kerello [ Upstream commit 6b1ba3f9040be5efc4396d86c9752cdc564730be ] 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 Fixes: 46b723dd867d ("mmc: mmci: add stm32 sdmmc variant") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240207143951.938144-1-christophe.kerello@= foss.st.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mmci_stm32_sdmmc.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_st= m32_sdmmc.c index 11ae0cb479239..e3201a621870a 100644 --- a/drivers/mmc/host/mmci_stm32_sdmmc.c +++ b/drivers/mmc/host/mmci_stm32_sdmmc.c @@ -200,6 +200,8 @@ static int sdmmc_idma_start(struct mmci_host *host, uns= igned int *datactrl) struct scatterlist *sg; int i; =20 + host->dma_in_progress =3D true; + if (!host->variant->dma_lli || data->sg_len =3D=3D 1 || idma->use_bounce_buffer) { u32 dma_addr; @@ -238,9 +240,30 @@ static int sdmmc_idma_start(struct mmci_host *host, un= signed int *datactrl) return 0; } =20 +static void sdmmc_idma_error(struct mmci_host *host) +{ + struct mmc_data *data =3D host->data; + struct sdmmc_idma *idma =3D host->dma_priv; + + if (!dma_inprogress(host)) + return; + + writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR); + host->dma_in_progress =3D false; + data->host_cookie =3D 0; + + if (!idma->use_bounce_buffer) + dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len, + mmc_get_dma_dir(data)); +} + static void sdmmc_idma_finalize(struct mmci_host *host, struct mmc_data *d= ata) { + if (!dma_inprogress(host)) + return; + writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR); + host->dma_in_progress =3D false; =20 if (!data->host_cookie) sdmmc_idma_unprep_data(host, data, 0); @@ -566,6 +589,7 @@ static struct mmci_host_ops sdmmc_variant_ops =3D { .dma_setup =3D sdmmc_idma_setup, .dma_start =3D sdmmc_idma_start, .dma_finalize =3D sdmmc_idma_finalize, + .dma_error =3D sdmmc_idma_error, .set_clkreg =3D mmci_sdmmc_set_clkreg, .set_pwrreg =3D mmci_sdmmc_set_pwrreg, .busy_complete =3D sdmmc_busy_complete, --=20 2.43.0