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

Commit 60027834 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

mmc: sdhci-of-esdhc: Check for error num after setting mask 



commit 40c67c291a93f8846c4a972c9ef1b7ba4544c8d0 upstream.

Because of the possible failure of the dma_supported(), the
dma_set_mask_and_coherent() may return error num.
Therefore, it should be better to check it and return the error if
fails.
And since the sdhci_setup_host() has already checked the return value of
the enable_dma, we need not check it in sdhci_resume_host() again.

Fixes: 5552d7ad ("mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220112083156.1124782-1-jiasheng@iscas.ac.cn


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

drivers/mmc/host/sdhci-of-esdhc.c

+6 −2
Original line number Diff line number Diff line
@@ -519,12 +519,16 @@ static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask) 


static int esdhc_of_enable_dma(struct sdhci_host *host)

{

	int ret;

	u32 value;

	struct device *dev = mmc_dev(host->mmc);



	if (of_device_is_compatible(dev->of_node, "fsl,ls1043a-esdhc") ||

	    of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc"))

		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));

	    of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc")) {

		ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));

		if (ret)

			return ret;

	}



	value = sdhci_readl(host, ESDHC_DMA_SYSCTL);