Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48e1dc10 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: fix kernel panic in _internal_dmac.c 



Since this driver checks if the return value of dma_map_sg() is minus
or not and keeps to enable the DMAC, it may cause kernel panic when
the dma_map_sg() returns 0. So, this patch fixes the issue.

Reported-by: default avatarDirk Behme <dirk.behme@de.bosch.com>
Fixes: 2a68ea78 ("mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e90e8da7

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+10 −7
Original line number Diff line number Diff line
@@ -146,11 +146,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, 
	WARN_ON(host->sg_len > 1);



	/* This DMAC cannot handle if buffer is not 8-bytes alignment */

	if (!IS_ALIGNED(sg->offset, 8)) {

		host->force_pio = true;

		renesas_sdhi_internal_dmac_enable_dma(host, false);

		return;

	}

	if (!IS_ALIGNED(sg->offset, 8))

		goto force_pio;



	if (data->flags & MMC_DATA_READ) {

		dtran_mode |= DTRAN_MODE_CH_NUM_CH1;
@@ -163,8 +160,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, 
	}



	ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, dir);

	if (ret < 0)

		return;

	if (ret == 0)

		goto force_pio;



	renesas_sdhi_internal_dmac_enable_dma(host, true);
@@ -176,6 +173,12 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, 
					    dtran_mode);

	renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR,

					    sg->dma_address);



	return;



force_pio:

	host->force_pio = true;

	renesas_sdhi_internal_dmac_enable_dma(host, false);

}



static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg)