On 7/01/19 12:11 PM, BOUGH CHEN wrote:
> Change to use sdhci_set_timeout() to set the maximum timeout, so that
> the host can use it's own set_timeout() callback to set the maximum
> timeout if the host has.
>
> Signed-off-by: Haibo Chen <haibo.chen@xxxxxxx>
Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> drivers/mmc/host/sdhci.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 3c188a7a9b66..d481f6aa36ec 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -867,7 +867,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
> bool *too_big)
> {
> u8 count;
> - struct mmc_data *data = cmd->data;
> + struct mmc_data *data;
> unsigned target_timeout, current_timeout;
>
> *too_big = true;
> @@ -881,6 +881,11 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
> if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
> return 0xE;
>
> + /* Unspecified command, asume max */
> + if (cmd == NULL)
> + return 0xE;
> +
> + data = cmd->data;
> /* Unspecified timeout, assume max */
> if (!data && !cmd->busy_timeout)
> return 0xE;
> @@ -3319,7 +3324,7 @@ void sdhci_cqe_enable(struct mmc_host *mmc)
> SDHCI_BLOCK_SIZE);
>
> /* Set maximum timeout */
> - sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL);
> + sdhci_set_timeout(host, NULL);
>
> host->ier = host->cqe_ier;
>
>
