Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3920077pxv; Mon, 5 Jul 2021 08:54:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPcr0KSIUB7OT6l+Eq4OiwKBGxoYYNkcJbCWT7XXkQpWteUR/mGZPoFX6LgIbVL87bCJie X-Received: by 2002:a05:6402:3582:: with SMTP id y2mr17228949edc.190.1625500447814; Mon, 05 Jul 2021 08:54:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625500447; cv=none; d=google.com; s=arc-20160816; b=n88ycIT9XtY9Ch2kvhu8F+N9tifXDBELjCtoaaqCOlW9sXP7wR3fTj+YKiA6ia1bGr pNL7N1KBjLN1arD2fa3aai/YKVo+xmLhkN+mhJX4wQ1naW25FT3DLL9aKiPtpr59aZCn BfiJxGlF4JYGHJlLxHB1HQhQlSfDVojGLWJsyMS0jGaDPH9YHw1YnHP6PgAxg746dOcM XcF5KmHW4CMBcVK1XuXQEj3TalRMKOb4EsPOoPp3zaMRUGdcQcbfsRNxHspY9gcU8jjw M458lPNSZ4J0R5ejCzWbTz7S+bCHikLSbeGIj8GqPUoFhnBTdw28j0RKdVLMzJlH2iUN Ek2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=evMJhKjYB9FjARPjpBuPRYQV6kNeVjZO2SA45iOQGS4=; b=Dk8uummwCv4pW8zPABwWElF0ZBBgeIAb8gx2/MGq2QcP/1KY8POF/fb5oOixsee3+8 hI6hcrmUpQRPfs3oJxVgPv4jOlTl9juyV37o9r3bG2WpxFaNj//1lpP33c3irlmZbY2M WllfDtauDyd5VI9U/8rkGeUmKO6fJ+72qorao7TmvUYaQoj+Sw8xir8lK0iN8XHbpeKo CqMwwwtgLg7BLZaxuOnay9tmpHUBlEbXyAUWXXZKbZmS9eQ5fWnJpO1S2NARCja8C2X1 mkmL6jKhgfeXxSNnTqjwn0o+csuK8nr2rshYJX7vbxICydmbclwTwYLASO3Yc+D6/Uv2 NqDw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn10si5127895ejc.671.2021.07.05.08.53.43; Mon, 05 Jul 2021 08:54:07 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231934AbhGEPya (ORCPT + 99 others); Mon, 5 Jul 2021 11:54:30 -0400 Received: from alexa-out.qualcomm.com ([129.46.98.28]:7084 "EHLO alexa-out.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231806AbhGEPy3 (ORCPT ); Mon, 5 Jul 2021 11:54:29 -0400 Received: from ironmsg08-lv.qualcomm.com ([10.47.202.152]) by alexa-out.qualcomm.com with ESMTP; 05 Jul 2021 08:51:52 -0700 X-QCInternal: smtphost Received: from ironmsg01-blr.qualcomm.com ([10.86.208.130]) by ironmsg08-lv.qualcomm.com with ESMTP/TLS/AES256-SHA; 05 Jul 2021 08:51:50 -0700 X-QCInternal: smtphost Received: from c-sbhanu-linux.qualcomm.com ([10.242.50.201]) by ironmsg01-blr.qualcomm.com with ESMTP; 05 Jul 2021 21:20:56 +0530 Received: by c-sbhanu-linux.qualcomm.com (Postfix, from userid 2344807) id 869C0504D; Mon, 5 Jul 2021 21:20:55 +0530 (IST) From: Shaik Sajida Bhanu To: adrian.hunter@intel.com, 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, Shaik Sajida Bhanu Subject: [PATCH V3] mmc: sdhci-msm: Update the software timeout value for sdhc Date: Mon, 5 Jul 2021 21:20:53 +0530 Message-Id: <1625500253-12815-1-git-send-email-sbhanu@codeaurora.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 V2: - Updated 22 with 22LL to avoid compiler warning as suggested by Adrian Hunter. - Added a check to update software data timeout value if its value is less than the calculated hardware data timeout value as suggested by Veerabhadrarao Badiganti. Changes since V1: - Moved software data timeout update part to qcom specific file as suggested by Veerabhadrarao Badiganti. --- drivers/mmc/host/sdhci-msm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index e44b7a6..64fb85e 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2089,6 +2089,23 @@ 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) +{ + + u32 count, start = 15; + + __sdhci_set_timeout(host, cmd); + count = sdhci_readb(host, SDHCI_TIMEOUT_CONTROL); + /* + * Update software timeout value if its value is less than hardware data + * timeout value. Qcom SoC hardware data timeout value was calculated + * using 4 * MCLK * 2^(count + 13). where MCLK = 1 / host->clock. + */ + if (cmd && cmd->data && host->clock > 400000 && host->clock <= 50000000 + && ((1 << (count + start)) > (10 * host->clock))) + host->data_timeout = 22LL * NSEC_PER_SEC; +} + static const struct cqhci_host_ops sdhci_msm_cqhci_ops = { .enable = sdhci_msm_cqe_enable, .disable = sdhci_msm_cqe_disable, @@ -2438,6 +2455,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 = { -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation