From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F235EC4338F for ; Fri, 6 Aug 2021 14:30:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D8787611C9 for ; Fri, 6 Aug 2021 14:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239507AbhHFOag (ORCPT ); Fri, 6 Aug 2021 10:30:36 -0400 Received: from mga05.intel.com ([192.55.52.43]:45009 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232085AbhHFOag (ORCPT ); Fri, 6 Aug 2021 10:30:36 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10068"; a="299967299" X-IronPort-AV: E=Sophos;i="5.84,300,1620716400"; d="scan'208";a="299967299" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 07:30:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,300,1620716400"; d="scan'208";a="504038869" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.174]) ([10.237.72.174]) by fmsmga004.fm.intel.com with ESMTP; 06 Aug 2021 07:30:18 -0700 Subject: Re: [PATCH V3 1/2] mmc: sdhci: Introduce max_timeout_count variable in sdhci_host To: Sarthak Garg , ulf.hansson@linaro.org Cc: vbadigan@codeaurora.org, stummala@codeaurora.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org References: <1627534001-17256-2-git-send-email-sartgarg@codeaurora.org> <1628232901-30897-1-git-send-email-sartgarg@codeaurora.org> <1628232901-30897-2-git-send-email-sartgarg@codeaurora.org> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Fri, 6 Aug 2021 17:30:50 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <1628232901-30897-2-git-send-email-sartgarg@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 6/08/21 9:54 am, Sarthak Garg wrote: > Introduce max_timeout_count variable in the sdhci_host structure > and use in timeout calculation. By default its set to 0xE > (max timeout register value as per SDHC spec). But at the same time > vendors drivers can update it if they support different max timeout > register value than 0xE. > > Signed-off-by: Sarthak Garg Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci.c | 16 +++++++++------- > drivers/mmc/host/sdhci.h | 1 + > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index aba6e10..613e1ab 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -934,21 +934,21 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, > > /* > * If the host controller provides us with an incorrect timeout > - * value, just skip the check and use 0xE. The hardware may take > + * value, just skip the check and use the maximum. The hardware may take > * longer to time out, but that's much better than having a too-short > * timeout value. > */ > if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL) > - return 0xE; > + return host->max_timeout_count; > > /* Unspecified command, asume max */ > if (cmd == NULL) > - return 0xE; > + return host->max_timeout_count; > > data = cmd->data; > /* Unspecified timeout, assume max */ > if (!data && !cmd->busy_timeout) > - return 0xE; > + return host->max_timeout_count; > > /* timeout in us */ > target_timeout = sdhci_target_timeout(host, cmd, data); > @@ -968,15 +968,15 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, > while (current_timeout < target_timeout) { > count++; > current_timeout <<= 1; > - if (count >= 0xF) > + if (count > host->max_timeout_count) > break; > } > > - if (count >= 0xF) { > + 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 = 0xE; > + count = host->max_timeout_count; > } else { > *too_big = false; > } > @@ -3940,6 +3940,8 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, > */ > host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; > > + host->max_timeout_count = 0xE; > + > return host; > } > > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index 074dc18..e8d04e4 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -517,6 +517,7 @@ struct sdhci_host { > > unsigned int max_clk; /* Max possible freq (MHz) */ > unsigned int timeout_clk; /* Timeout freq (KHz) */ > + u8 max_timeout_count; /* Vendor specific max timeout count */ > unsigned int clk_mul; /* Clock Muliplier value */ > > unsigned int clock; /* Current clock (MHz) */ >