lkml.org 
[lkml]   [2019]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 077/148] mmc: sdhci: Let drivers define their DMA mask
    Date
    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 4ee7dde4c777f14cb0f98dd201491bf6cc15899b upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci.c | 12 ++++--------
    drivers/mmc/host/sdhci.h | 1 +
    2 files changed, 5 insertions(+), 8 deletions(-)

    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -3763,18 +3763,14 @@ int sdhci_setup_host(struct sdhci_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);
    --- 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);

    \
     
     \ /
      Last update: 2019-10-10 10:42    [W:4.566 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site