On Fri, 17 Sept 2021 at 19:27, Bean Huo <huobean@xxxxxxxxx> wrote:
>
> From: Bean Huo <beanhuo@xxxxxxxxxx>
>
> Clean up sdhci_calc_timeout() a bit, and let it set too_big to be true only
> when the timeout value required by the eMMC device exceeds the capability of
> the host hardware timer.
>
> Signed-off-by: Bean Huo <beanhuo@xxxxxxxxxx>
Applied for next (deferring patch2), thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 7ae398f8d4d3..357b365bf0ec 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -930,7 +930,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
> struct mmc_data *data;
> unsigned target_timeout, current_timeout;
>
> - *too_big = true;
> + *too_big = false;
>
> /*
> * If the host controller provides us with an incorrect timeout
> @@ -941,7 +941,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
> if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
> return host->max_timeout_count;
>
> - /* Unspecified command, asume max */
> + /* Unspecified command, assume max */
> if (cmd == NULL)
> return host->max_timeout_count;
>
> @@ -968,17 +968,14 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
> while (current_timeout < target_timeout) {
> count++;
> current_timeout <<= 1;
> - if (count > host->max_timeout_count)
> + if (count > host->max_timeout_count) {
> + if (!(host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT))
> + DBG("Too large timeout 0x%x requested for CMD%d!\n",
> + count, cmd->opcode);
> + count = host->max_timeout_count;
> + *too_big = true;
> break;
> - }
> -
> - if (count > host->max_timeout_count) {
> - if (!(host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT))
> - DBG("Too large timeout 0x%x requested for CMD%d!\n",
> - count, cmd->opcode);
> - count = host->max_timeout_count;
> - } else {
> - *too_big = false;
> + }
> }
>
> return count;
> --
> 2.25.1
>
