mmc: mvsdio: Fix dma_unmap_sg() nents value

[PATCH] mmc: mvsdio: Fix dma_unmap_sg() nents value

Posted by Thomas Fourier 1 month, 1 week ago

The dma_unmap_sg() functions should be called with the same nents as the
dma_map_sg(), not the value the map function returned.

Fixes: 236caa7cc351 ("mmc: SDIO driver for Marvell SoCs")
Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
---
 drivers/mmc/host/mvsdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a9e6277789ba..79df2fa89a3f 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -292,7 +292,7 @@ static u32 mvsd_finish_data(struct mvsd_host *host, struct mmc_data *data,
 		host->pio_ptr = NULL;
 		host->pio_size = 0;
 	} else {
-		dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->sg_frags,
+		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
 			     mmc_get_dma_dir(data));
 	}
 
-- 
2.43.0

Re: [PATCH] mmc: mvsdio: Fix dma_unmap_sg() nents value

Posted by Ulf Hansson 3 weeks ago

On Tue, 26 Aug 2025 at 09:59, Thomas Fourier <fourier.thomas@gmail.com> wrote:
>
> The dma_unmap_sg() functions should be called with the same nents as the
> dma_map_sg(), not the value the map function returned.
>
> Fixes: 236caa7cc351 ("mmc: SDIO driver for Marvell SoCs")
> Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/mvsdio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index a9e6277789ba..79df2fa89a3f 100644
> --- a/drivers/mmc/host/mvsdio.c
> +++ b/drivers/mmc/host/mvsdio.c
> @@ -292,7 +292,7 @@ static u32 mvsd_finish_data(struct mvsd_host *host, struct mmc_data *data,
>                 host->pio_ptr = NULL;
>                 host->pio_size = 0;
>         } else {
> -               dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->sg_frags,
> +               dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
>                              mmc_get_dma_dir(data));
>         }
>
> --
> 2.43.0
>

Re: [PATCH] mmc: mvsdio: Fix dma_unmap_sg() nents value

Posted by Linus Walleij 1 month ago

On Tue, Aug 26, 2025 at 9:59 AM Thomas Fourier <fourier.thomas@gmail.com> wrote:

> The dma_unmap_sg() functions should be called with the same nents as the
> dma_map_sg(), not the value the map function returned.
>
> Fixes: 236caa7cc351 ("mmc: SDIO driver for Marvell SoCs")
> Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij