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

Commit c645de49 authored by Ludovic Barre's avatar Ludovic Barre Committed by Greg Kroah-Hartman
Browse files

mmc: mmci_sdmmc: Replace sg_dma_xxx macros 



commit 127e6e98ca9b8ac4f87698ebce1508e3449bb791 upstream.

sg_dma_xxx should be used after a dma_map_sg call has been done to get bus
addresses of each of the SG entries and their lengths.  But mmci_host_ops
validate_data can be called before dma_map_sg.  This patch replaces theses
macros by sg->offset and sg->length which are always defined.

Signed-off-by: default avatarLudovic Barre <ludovic.barre@st.com>
Link: https://lore.kernel.org/r/20200128090636.13689-2-ludovic.barre@st.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d99cce8

drivers/mmc/host/mmci_stm32_sdmmc.c

+3 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ int sdmmc_idma_validate_data(struct mmci_host *host, 
	 * excepted the last element which has no constraint on idmasize

	 */

	for_each_sg(data->sg, sg, data->sg_len - 1, i) {

		if (!IS_ALIGNED(sg_dma_address(data->sg), sizeof(u32)) ||

		    !IS_ALIGNED(sg_dma_len(data->sg), SDMMC_IDMA_BURST)) {

		if (!IS_ALIGNED(data->sg->offset, sizeof(u32)) ||

		    !IS_ALIGNED(data->sg->length, SDMMC_IDMA_BURST)) {

			dev_err(mmc_dev(host->mmc),

				"unaligned scatterlist: ofst:%x length:%d\n",

				data->sg->offset, data->sg->length);
@@ -45,7 +45,7 @@ int sdmmc_idma_validate_data(struct mmci_host *host, 
		}

	}



	if (!IS_ALIGNED(sg_dma_address(data->sg), sizeof(u32))) {

	if (!IS_ALIGNED(data->sg->offset, sizeof(u32))) {

		dev_err(mmc_dev(host->mmc),

			"unaligned last scatterlist: ofst:%x length:%d\n",

			data->sg->offset, data->sg->length);