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

Commit 053bf34f authored by Per Forlin's avatar Per Forlin Committed by Chris Ball
Browse files

mmc: omap_hsmmc: DMA unmap only once in case of MMC error 



Reported by Russell King:
mmcblk0: error -84 transferring data, sector 149201, nr 64,
cmd response 0x900, card status 0xb00
mmcblk0: retrying using single block read

WARNING: at lib/dma-debug.c:811 check_unmap
omap_hsmmc omap_hsmmc.0: DMA-API: device driver tries to free DMA memory
it has not allocated [device address=0x0000000080933000] [size=20480 bytes]

In case of an error dma_unmap() is issued in omap_hsmmc_dma_cleanup()
and then again in omap_hsmmc_post_req(). Resolve this by clearing the
host_cookie to indicate there is no DMA mapped memory to unmap.

Signed-off-by: default avatarPer Forlin <per.forlin@linaro.org>
Tested-by: default avatarBalaji T K <balajitk@ti.com>
Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 77a7300a

drivers/mmc/host/omap_hsmmc.c

+5 −2
Original line number Diff line number Diff line
@@ -1010,6 +1010,7 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno) 
			host->data->sg_len,

			omap_hsmmc_get_dma_dir(host, host->data));

		omap_free_dma(dma_ch);

		host->data->host_cookie = 0;

	}

	host->data = NULL;

}
@@ -1575,7 +1576,9 @@ static void omap_hsmmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq, 
	struct mmc_data *data = mrq->data;



	if (host->use_dma) {

		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,

		if (data->host_cookie)

			dma_unmap_sg(mmc_dev(host->mmc), data->sg,

				     data->sg_len,

				     omap_hsmmc_get_dma_dir(host, data));

		data->host_cookie = 0;

	}