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: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Cc: stable@vger.kernel.org # v4.15 +
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 922a5b594c5eb4fc9924544ee9135c4d2f7eb3c1..b056400e34b14d5ba0eba44b6c72556c7d273592 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3781,18 +3781,14 @@ 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)) {
-               ret = sdhci_set_dma_mask(host);
+               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)
                        ret = host->ops->enable_dma(host);

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index a29c4cd2d92e56a0b919b12c6623ba7e47a5baf9..0ed3e0eaef5f99e09ac1e299264983d9925a38dc 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -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);