From patchwork Thu Apr 26 07:52:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 10364845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AAE1B602DC for ; Thu, 26 Apr 2018 07:53:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ED4829074 for ; Thu, 26 Apr 2018 07:53:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9026529078; Thu, 26 Apr 2018 07:53:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F7B29074 for ; Thu, 26 Apr 2018 07:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753123AbeDZHx3 (ORCPT ); Thu, 26 Apr 2018 03:53:29 -0400 Received: from mga07.intel.com ([134.134.136.100]:54170 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752962AbeDZHx2 (ORCPT ); Thu, 26 Apr 2018 03:53:28 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2018 00:53:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,330,1520924400"; d="scan'208";a="194515473" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.168]) ([10.237.72.168]) by orsmga004.jf.intel.com with ESMTP; 26 Apr 2018 00:53:25 -0700 Subject: Re: [PATCH v4 08/12] mmc: sdhci: Program a relatively accurate SW timeout value To: Kishon Vijay Abraham I , Ulf Hansson Cc: Rob Herring , Mark Rutland , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Tony Lindgren References: <20180425120937.29867-1-kishon@ti.com> <20180425120937.29867-9-kishon@ti.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Thu, 26 Apr 2018 10:52:22 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180425120937.29867-9-kishon@ti.com> Content-Language: en-US Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 25/04/18 15:09, Kishon Vijay Abraham I wrote: > sdhci has a 10 second timeout to catch devices that stop responding. > In the case of quirk SDHCI_QUIRK2_DISABLE_HW_TIMEOUT, instead of > programming 10 second arbitrary value, calculate the total time it would > take for the entire transfer to happen and program the timeout value > accordingly. > > Signed-off-by: Kishon Vijay Abraham I > Signed-off-by: Adrian Hunter Looks like I lost a couple of chunks of the patch, sorry :-( i.e. > --- > drivers/mmc/host/sdhci.c | 36 ++++++++++++++++++++++++++++++++++++ > drivers/mmc/host/sdhci.h | 10 ++++++++++ > 2 files changed, 46 insertions(+) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index c432ec3644aa..1ed0b8b6570a 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -738,6 +738,39 @@ static unsigned int sdhci_target_timeout(struct sdhci_host *host, > return target_timeout; > } > > +static void sdhci_calc_sw_timeout(struct sdhci_host *host, > + struct mmc_command *cmd) > +{ > + struct mmc_data *data = cmd->data; > + struct mmc_host *mmc = host->mmc; > + struct mmc_ios *ios = &mmc->ios; > + unsigned char bus_width = 1 << ios->bus_width; > + unsigned int blksz; > + unsigned int freq; > + u64 target_timeout; > + u64 transfer_time; > + > + target_timeout = sdhci_target_timeout(host, cmd, data); > + target_timeout *= NSEC_PER_USEC; > + > + if (data) { > + blksz = data->blksz; > + freq = host->mmc->actual_clock ? : host->clock; > + transfer_time = (u64)blksz * NSEC_PER_SEC * (8 / bus_width); > + do_div(transfer_time, freq); > + /* multiply by '2' to account for any unknowns */ > + transfer_time = transfer_time * 2; > + /* calculate timeout for the entire data */ > + host->data_timeout = data->blocks * target_timeout + > + transfer_time; > + } else { > + host->data_timeout = target_timeout; > + } > + > + if (host->data_timeout) > + host->data_timeout += MMC_CMD_TRANSFER_TIME; > +} > + > static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, > bool *too_big) > { > @@ -831,6 +864,7 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) > > if (too_big && > host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) { > + sdhci_calc_sw_timeout(host, cmd); > sdhci_set_data_timeout_irq(host, false); > } else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) { > sdhci_set_data_timeout_irq(host, true); > @@ -845,6 +879,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) > u8 ctrl; > struct mmc_data *data = cmd->data; > > + host->data_timeout = 0; > + > if (sdhci_data_line_cmd(cmd)) > sdhci_set_timeout(host, cmd); > > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index f6555c0f4ad3..23966f887da6 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -332,6 +332,14 @@ struct sdhci_adma2_64_desc { > /* Allow for a a command request and a data request at the same time */ > #define SDHCI_MAX_MRQS 2 > > +/* > + * 48bit command and 136 bit response in 100KHz clock could take upto 2.48ms. > + * However since the start time of the command, the time between > + * command and response, and the time between response and start of data is > + * not known, set the command transfer time to 10ms. > + */ > +#define MMC_CMD_TRANSFER_TIME (10 * NSEC_PER_MSEC) /* max 10 ms */ > + > enum sdhci_cookie { > COOKIE_UNMAPPED, > COOKIE_PRE_MAPPED, /* mapped by sdhci_pre_req() */ > @@ -555,6 +563,8 @@ struct sdhci_host { > /* Host SDMA buffer boundary. */ > u32 sdma_boundary; > > + u64 data_timeout; > + > unsigned long private[0] ____cacheline_aligned; > }; > > --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1ed0b8b6570a..a019fd01ccf2 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1234,13 +1234,6 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) mdelay(1); } - timeout = jiffies; - if (!cmd->data && cmd->busy_timeout > 9000) - timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ; - else - timeout += 10 * HZ; - sdhci_mod_timer(host, cmd->mrq, timeout); - host->cmd = cmd; if (sdhci_data_line_cmd(cmd)) { WARN_ON(host->data_cmd); @@ -1280,6 +1273,15 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200) flags |= SDHCI_CMD_DATA; + timeout = jiffies; + if (host->data_timeout) + timeout += nsecs_to_jiffies(host->data_timeout); + else if (!cmd->data && cmd->busy_timeout > 9000) + timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ; + else + timeout += 10 * HZ; + sdhci_mod_timer(host, cmd->mrq, timeout); + sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND); } EXPORT_SYMBOL_GPL(sdhci_send_command);