Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp355598pxv; Wed, 30 Jun 2021 07:11:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWbegScQWHw2ckSWkjDRNiwhJOQqGp6as72ieNKH4EeXuTyzS5avQ7RU+aOVMY1vilVBfm X-Received: by 2002:a17:906:b254:: with SMTP id ce20mr35617317ejb.480.1625062281278; Wed, 30 Jun 2021 07:11:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625062281; cv=none; d=google.com; s=arc-20160816; b=DuSsrBW99Uf8FaHNxUdGQgQRYFa/mp7qHXNA/q8fc7FfZiLkOz+NxKSRggJ1IVgMvy jD8DgQEt8qz8ZK6xz7BBZqDBzo93tyzNUPG91XWXKeT/J0vlBBstulJi7yLPqR6iLVR0 hadA5GZcPk9AGUR7Qp+Ba2FfQsr/BROawXcchHz+SukZ+aUbGVNZo1ANB0DBaw3a6Z1P oHkx7xI3TkePcdSMUGqEWf5r3P8JtkzY27tFnJh/aW8hSf2gOkVcwCTOmhhPvGJIiamg f9WOXeGEE9OAkWMHXW9J226Kve1iOi4t1hKsyIlemrV02YtUlvVuiCMoXQMD/5IDDOyC YlsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:organization :from:references:cc:to:subject; bh=T9nLL7VeAMpVgv7Wn0S0KJWJDsLatxhGPhoqCxdA1ek=; b=sqoQ4p7HcSxMKV4w2f36g+9urvECSKbFpLHXqe/fEvn34ADo3kBqgEbN1QzF5NDnPM zJncWqcOZLhDbDcJ/mdifPVvaQsZY8xtMJQli0JikSBrqDQt25bo4Iw4JAHBO0/ATdD4 0Qhe5tDGka51HDmju7Nz+aGzuzp3kcljGgiiTDIYlND0ZZXAxdIVU+XRDaCN3GWsRJQM QtU5uYbnCCjPony4RfBCt/DIlWENDvbtvWHTVSDCYm7R/Ff/tSASgdQhA28eSJvOTNy2 VR+X49MEImhcAQ8GSEaHAmdET6UPKClBgHyB6HNzBwYLVAWqTlZ+UUAMyjGJPG1scjYK VW8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d16si19879221edy.400.2021.06.30.07.10.52; Wed, 30 Jun 2021 07:11:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234890AbhF3OLJ (ORCPT + 99 others); Wed, 30 Jun 2021 10:11:09 -0400 Received: from mga04.intel.com ([192.55.52.120]:34140 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234851AbhF3OLI (ORCPT ); Wed, 30 Jun 2021 10:11:08 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10030"; a="206532524" X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="206532524" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 07:08:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="419999203" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.79]) ([10.237.72.79]) by fmsmga007.fm.intel.com with ESMTP; 30 Jun 2021 07:08:35 -0700 Subject: Re: [PATCH V2] mmc: sdhci: Update the software timeout value for sdhc To: Shaik Sajida Bhanu , ulf.hansson@linaro.org Cc: asutoshd@codeaurora.org, stummala@codeaurora.org, vbadigan@codeaurora.org, rampraka@codeaurora.org, sayalil@codeaurora.org, sartgarg@codeaurora.org, rnayak@codeaurora.org, cang@codeaurora.org, pragalla@codeaurora.org, nitirawa@codeaurora.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, agross@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org References: <1624804840-3479-1-git-send-email-sbhanu@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: <3217c101-534b-bfcb-7ba9-5749d73cf242@intel.com> Date: Wed, 30 Jun 2021 17:08:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <1624804840-3479-1-git-send-email-sbhanu@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-kernel@vger.kernel.org On 27/06/21 5:40 pm, Shaik Sajida Bhanu wrote: > Whenever SDHC run at clock rate 50MHZ or below, the hardware data > timeout value will be 21.47secs, which is approx. 22secs and we have > a current software timeout value as 10secs. We have to set software > timeout value more than the hardware data timeout value to avioid seeing > the below register dumps. > > [ 332.953670] mmc2: Timeout waiting for hardware interrupt. > [ 332.959608] mmc2: sdhci: ============ SDHCI REGISTER DUMP =========== > [ 332.966450] mmc2: sdhci: Sys addr: 0x00000000 | Version: 0x00007202 > [ 332.973256] mmc2: sdhci: Blk size: 0x00000200 | Blk cnt: 0x00000001 > [ 332.980054] mmc2: sdhci: Argument: 0x00000000 | Trn mode: 0x00000027 > [ 332.986864] mmc2: sdhci: Present: 0x01f801f6 | Host ctl: 0x0000001f > [ 332.993671] mmc2: sdhci: Power: 0x00000001 | Blk gap: 0x00000000 > [ 333.000583] mmc2: sdhci: Wake-up: 0x00000000 | Clock: 0x00000007 > [ 333.007386] mmc2: sdhci: Timeout: 0x0000000e | Int stat: 0x00000000 > [ 333.014182] mmc2: sdhci: Int enab: 0x03ff100b | Sig enab: 0x03ff100b > [ 333.020976] mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000000 > [ 333.027771] mmc2: sdhci: Caps: 0x322dc8b2 | Caps_1: 0x0000808f > [ 333.034561] mmc2: sdhci: Cmd: 0x0000183a | Max curr: 0x00000000 > [ 333.041359] mmc2: sdhci: Resp[0]: 0x00000900 | Resp[1]: 0x00000000 > [ 333.048157] mmc2: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000000 > [ 333.054945] mmc2: sdhci: Host ctl2: 0x00000000 > [ 333.059657] mmc2: sdhci: ADMA Err: 0x00000000 | ADMA Ptr: > 0x0000000ffffff218 > [ 333.067178] mmc2: sdhci_msm: ----------- VENDOR REGISTER DUMP > ----------- > [ 333.074343] mmc2: sdhci_msm: DLL sts: 0x00000000 | DLL cfg: > 0x6000642c | DLL cfg2: 0x0020a000 > [ 333.083417] mmc2: sdhci_msm: DLL cfg3: 0x00000000 | DLL usr ctl: > 0x00000000 | DDR cfg: 0x80040873 > [ 333.092850] mmc2: sdhci_msm: Vndr func: 0x00008a9c | Vndr func2 : > 0xf88218a8 Vndr func3: 0x02626040 > [ 333.102371] mmc2: sdhci: ============================================ > > So, set software timeout value more than hardware timeout value. > > Signed-off-by: Shaik Sajida Bhanu > --- > > Changes since V1: > - Moved software data timeout update part to qcom specific file as > suggested by Veerabhadrarao Badiganti. > --- > drivers/mmc/host/sdhci-msm.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index e44b7a6..58e651e 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -2089,6 +2089,14 @@ static void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery) > sdhci_cqe_disable(mmc, recovery); > } > > +static void sdhci_msm_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) > +{ > + > + __sdhci_set_timeout(host, cmd); > + if (cmd && (cmd->data) && (host->clock > 400000) && (host->clock <= 50000000)) There are some redundant parenthesis there and cmd is never NULL i.e. could be: if (cmd->data && host->clock > 400000 && host->clock <= 50000000) > + host->data_timeout = 22 * NSEC_PER_SEC; That needs to be 22LL to make the compiler warning go away > +} > + > static const struct cqhci_host_ops sdhci_msm_cqhci_ops = { > .enable = sdhci_msm_cqe_enable, > .disable = sdhci_msm_cqe_disable, > @@ -2438,6 +2446,7 @@ static const struct sdhci_ops sdhci_msm_ops = { > .irq = sdhci_msm_cqe_irq, > .dump_vendor_regs = sdhci_msm_dump_vendor_regs, > .set_power = sdhci_set_power_noreg, > + .set_timeout = sdhci_msm_set_timeout, > }; > > static const struct sdhci_pltfm_data sdhci_msm_pdata = { >