Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp1143861ybh; Thu, 12 Mar 2020 18:12:13 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt1l/6pcmw2AvQV7nLF79RpdbrcSk1AjbmXGiDRc8LV8NtaEvPb4fQB3lYR/ooKvWVrVy2T X-Received: by 2002:a9d:6c58:: with SMTP id g24mr8737577otq.106.1584061932940; Thu, 12 Mar 2020 18:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584061932; cv=none; d=google.com; s=arc-20160816; b=SWnUF+791zzoLzRpzbohvhPW2zkzMmfbrNsAKrQILkUL7gXTze/y6do43H8m9rjyLK K5NCLOkACbr/3wNbGU5zyBFA5qNkNoYdSuKVWrxAAJlFYurgVokSWdHRTED1kMncc9Yp 3rUuujKfJkCe/LbMyfCA81c3ZBsQ6reYdUAGyt5otqld+UOmAursGeKOohCmhUMg5ImB mwJeVHR6W/l49tHfrdBjowo4H00VtoXZceCTFMlDqa6/aknoGaSwBUyHcWD50DdBgUVr zxgEKOwaOT57Y+qJPLrAzw3coRScPAim08SGumcajnAKTf3muqpijqbu6OY3wPRccons xpxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=3TyCKOUEa+ZZzPxPPgj5u5wAYNCe+MYCECoIl/e8ZLs=; b=tq9rrMOLt7gNpR6RKMPGCNG4+KtYL4HjfPVL/9nlqUQq06bnM2WziIxBRtQ/ymfy5C Jfby4IWNhAOp4/IrQUVvoI0V4gUN32RghVqkgV6LgAC9tC3s4P8rhaJRKOQtxgv9z9TG DMtqk7+7XzTPBP41cqiY5N3/vPU0tunt9z+S+ZV02HWppIIvxF5hlsIVxnPGl8e3gXEI z+axtzo2kvdZQil+z2uttvvy6EkB7ZROI4uKYSoJpbKJbZyBENIY6e76NQNRahrJuJCs T8ju6ULhaeECXYvLFBumRf9N46d4Au+FlGs+wcBMHnD0PkVjVzp8J6AWPnBQVjnWDvs5 /PFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f204si3677392oia.43.2020.03.12.18.12.01; Thu, 12 Mar 2020 18:12:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727328AbgCMBLd (ORCPT + 99 others); Thu, 12 Mar 2020 21:11:33 -0400 Received: from 97-93-29-23.dhcp.snlo.ca.charter.com ([97.93.29.23]:54478 "EHLO skomatineni-linux.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727220AbgCMBL2 (ORCPT ); Thu, 12 Mar 2020 21:11:28 -0400 Received: by skomatineni-linux.nvidia.com (Postfix, from userid 1000) id DCAC81040079; Tue, 10 Mar 2020 17:20:31 -0700 (PDT) From: Sowjanya Komatineni To: adrian.hunter@intel.com, ulf.hansson@linaro.org, baolin.wang@linaro.org, kstewart@linuxfoundation.org, tglx@linutronix.de, bradleybolen@gmail.com, gregkh@linuxfoundation.org, thierry.reding@gmail.com, jonathanh@nvidia.com Cc: skomatineni@nvidia.com, anrao@nvidia.com, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v2 1/2] sdhci: tegra: Implement Tegra specific set_timeout callback Date: Tue, 10 Mar 2020 17:20:29 -0700 Message-Id: <1583886030-11339-1-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tegra host supports HW busy detection and timeouts based on the count programmed in SDHCI_TIMEOUT_CONTROL register and max busy timeout it supports is 11s in finite busy wait mode. Some operations like SLEEP_AWAKE, ERASE and flush cache through SWITCH commands take longer than 11s and Tegra host supports infinite HW busy wait mode where HW waits forever till the card is busy without HW timeout. This patch implements Tegra specific set_timeout sdhci_ops to allow switching between finite and infinite HW busy detection wait modes based on the device command expected operation time. Signed-off-by: Sowjanya Komatineni --- drivers/mmc/host/sdhci-tegra.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index a25c3a4..fa8f6a4 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -45,6 +45,7 @@ #define SDHCI_TEGRA_CAP_OVERRIDES_DQS_TRIM_SHIFT 8 #define SDHCI_TEGRA_VENDOR_MISC_CTRL 0x120 +#define SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT BIT(0) #define SDHCI_MISC_CTRL_ENABLE_SDR104 0x8 #define SDHCI_MISC_CTRL_ENABLE_SDR50 0x10 #define SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300 0x20 @@ -1227,6 +1228,34 @@ static u32 sdhci_tegra_cqhci_irq(struct sdhci_host *host, u32 intmask) return 0; } +static void tegra_sdhci_set_timeout(struct sdhci_host *host, + struct mmc_command *cmd) +{ + u32 val; + + /* + * HW busy detection timeout is based on programmed data timeout + * counter and maximum supported timeout is 11s which may not be + * enough for long operations like cache flush, sleep awake, erase. + * + * ERASE_TIMEOUT_LIMIT bit of VENDOR_MISC_CTRL register allows + * host controller to wait for busy state until the card is busy + * without HW timeout. + * + * So, use infinite busy wait mode for operations that may take + * more than maximum HW busy timeout of 11s otherwise use finite + * busy wait mode. + */ + val = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); + if (cmd && cmd->busy_timeout >= 11 * HZ) + val |= SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; + else + val &= ~SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; + sdhci_writel(host, val, SDHCI_TEGRA_VENDOR_MISC_CTRL); + + __sdhci_set_timeout(host, cmd); +} + static const struct cqhci_host_ops sdhci_tegra_cqhci_ops = { .write_l = tegra_cqhci_writel, .enable = sdhci_tegra_cqe_enable, @@ -1366,6 +1395,7 @@ static const struct sdhci_ops tegra210_sdhci_ops = { .set_uhs_signaling = tegra_sdhci_set_uhs_signaling, .voltage_switch = tegra_sdhci_voltage_switch, .get_max_clock = tegra_sdhci_get_max_clock, + .set_timeout = tegra_sdhci_set_timeout, }; static const struct sdhci_pltfm_data sdhci_tegra210_pdata = { @@ -1403,6 +1433,7 @@ static const struct sdhci_ops tegra186_sdhci_ops = { .voltage_switch = tegra_sdhci_voltage_switch, .get_max_clock = tegra_sdhci_get_max_clock, .irq = sdhci_tegra_cqhci_irq, + .set_timeout = tegra_sdhci_set_timeout, }; static const struct sdhci_pltfm_data sdhci_tegra186_pdata = { -- 2.7.4