Re: [PATCH 1/2] mmc: sdhci: Let drivers define their DMA mask

[Nicolin Chen]

On Fri, Sep 20, 2019 at 04:53:16PM +0200, Thierry Reding wrote:
> From: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> 
> Add host operation ->set_dma_mask() so that drivers can define their own
> DMA masks.
> 
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>

Tested-by: Nicolin Chen <nicoleotsuka@xxxxxxxxx>

Ran a boot test with both patches on a Tegra186 board.

Thanks!

> ---
>  drivers/mmc/host/sdhci.c | 12 ++++--------
>  drivers/mmc/host/sdhci.h |  1 +
>  2 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index a5dc5aae973e..bc04c3180477 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -3756,18 +3756,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 902f855efe8f..8285498c0d8a 100644
> --- 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);
> -- 
> 2.23.0
>