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

Commit 4ee7dde4 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Let drivers define their DMA mask 



Add host operation ->set_dma_mask() so that drivers can define their own
DMA masks.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Cc: stable@vger.kernel.org # v4.15 +
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 121bd08b

drivers/mmc/host/sdhci.c

+4 −8
Original line number Diff line number Diff line
@@ -3781,17 +3781,13 @@ int sdhci_setup_host(struct sdhci_host *host) 
		host->flags &= ~SDHCI_USE_ADMA;

	}



	/*

	 * It is assumed that a 64-bit capable device has set a 64-bit DMA mask

	 * and *must* do 64-bit DMA.  A driver has the opportunity to change

	 * that during the first call to ->enable_dma().  Similarly

	 * SDHCI_QUIRK2_BROKEN_64_BIT_DMA must be left to the drivers to

	 * implement.

	 */

	if (sdhci_can_64bit_dma(host))

		host->flags |= SDHCI_USE_64_BIT_DMA;



	if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {

		if (host->ops->set_dma_mask)

			ret = host->ops->set_dma_mask(host);

		else

			ret = sdhci_set_dma_mask(host);



		if (!ret && host->ops->enable_dma)

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ struct sdhci_ops { 


	u32		(*irq)(struct sdhci_host *host, u32 intmask);



	int		(*set_dma_mask)(struct sdhci_host *host);

	int		(*enable_dma)(struct sdhci_host *host);

	unsigned int	(*get_max_clock)(struct sdhci_host *host);

	unsigned int	(*get_min_clock)(struct sdhci_host *host);