Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp54809imm; Thu, 30 Aug 2018 08:10:16 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZDGr+swpgQ+NxFxQvtib9JxZNlu7fVvQHD4S7C5uSg0whN4/CRFKNFUjSZxO4nx7tzoOQ2 X-Received: by 2002:a62:3001:: with SMTP id w1-v6mr10872848pfw.19.1535641816545; Thu, 30 Aug 2018 08:10:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535641816; cv=none; d=google.com; s=arc-20160816; b=axlZXCHwKoj1/qg7CfjINi+aioLKCkzTe8wXQC5KlIl2SRLwryshKcXozI87/3s9bp 072GhPTbSWnSi5qj6ZGnFERCBt9I9HgV3PPCexP8cK7qwFHvr1qNxHmenA1qQAq1+5pX DycDZYph7D+P65ThSGPi5F55av0FRlkfhNfNHfguBhCFCu+Gj54cU3/PQbArjH9B9Mix pN/2SXDwiLUdwoGGvjh68c3BPsrPBBgLnEnvD4g+0xxqMkEc9fbSPrxJAso8QoV7pkV0 rZVPzzPSqfQ0aQCInv4VE3cyAbLh8PnDrozobgNPLPhi8SkhgJ99zc5DjpNlADc/tdIM HL1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=SJr1BdNzNsQMuVVizTmTIdK5ILkZejeY8HMfftOl70s=; b=PohimSo/NVyj7w22rLOyPBTcn1uM/n3qTzmGGqIDMvsD5lDABEJ3La4fo5TWSov/0F tT8/OXi5pRq4mqLdy0oMuuGjX73/628QfNFQgcv1+luHjYO/mAccN/GdhDZYiqD7v1gL J72S7S6qQh5ljo2wf7UJ4KlakR2HWFcHRuw4qxCjFvNu1YIQiQFT+s5Irf9a50W2kpq4 mQqBOZv+kQenO3ISBX47v8aZdGYgbdWjN/aFywGFUxz+TA+Pn+yhZM420so2ZnftLhZv tBA76XDpMY+Kb9HUTXQwAEdaA9roOgD+uxVwbs229k4QiZ3TZuVMThJocYD38MVvBG7d ml2w== 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 g13-v6si6363701plo.153.2018.08.30.08.09.57; Thu, 30 Aug 2018 08:10:16 -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 S1729558AbeH3TKB (ORCPT + 99 others); Thu, 30 Aug 2018 15:10:01 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11535 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728550AbeH3TJ7 (ORCPT ); Thu, 30 Aug 2018 15:09:59 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 30 Aug 2018 08:07:19 -0700 Received: from HQMAIL106.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Thu, 30 Aug 2018 08:07:23 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Thu, 30 Aug 2018 08:07:23 -0700 Received: from HQMAIL106.nvidia.com (172.18.146.12) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 30 Aug 2018 15:07:23 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Thu, 30 Aug 2018 15:07:23 +0000 Received: from dhcp-10-21-25-168.Nvidia.com (Not Verified[10.21.25.201]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Thu, 30 Aug 2018 08:07:22 -0700 From: Aapo Vienamo To: Rob Herring , Mark Rutland , Thierry Reding , Jonathan Hunter , Ulf Hansson , Adrian Hunter , Mikko Perttunen , Stefan Agner CC: , , , , Aapo Vienamo Subject: [PATCH v3 12/38] mmc: tegra: Poll for calibration completion Date: Thu, 30 Aug 2018 18:06:13 +0300 Message-ID: <20180830150639.21048-13-avienamo@nvidia.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830150639.21048-1-avienamo@nvidia.com> References: <20180830150639.21048-1-avienamo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement polling with 10 ms timeout for automatic pad drive strength calibration. Signed-off-by: Aapo Vienamo Acked-by: Thierry Reding --- drivers/mmc/host/sdhci-tegra.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 11185e96f3c3..56b637c5b594 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,9 @@ #define SDHCI_AUTO_CAL_START BIT(31) #define SDHCI_AUTO_CAL_ENABLE BIT(29) +#define SDHCI_TEGRA_AUTO_CAL_STATUS 0x1ec +#define SDHCI_TEGRA_AUTO_CAL_ACTIVE BIT(31) + #define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0) #define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1) #define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2) @@ -226,13 +230,21 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) static void tegra_sdhci_pad_autocalib(struct sdhci_host *host) { - u32 val; + u32 reg; + int ret; + + reg = sdhci_readl(host, SDHCI_TEGRA_AUTO_CAL_CONFIG); + reg |= SDHCI_AUTO_CAL_ENABLE | SDHCI_AUTO_CAL_START; + sdhci_writel(host, reg, SDHCI_TEGRA_AUTO_CAL_CONFIG); - mdelay(1); + usleep_range(1, 2); + /* 10 ms timeout */ + ret = readl_poll_timeout(host->ioaddr + SDHCI_TEGRA_AUTO_CAL_STATUS, + reg, !(reg & SDHCI_TEGRA_AUTO_CAL_ACTIVE), + 1000, 10000); - val = sdhci_readl(host, SDHCI_TEGRA_AUTO_CAL_CONFIG); - val |= SDHCI_AUTO_CAL_ENABLE | SDHCI_AUTO_CAL_START; - sdhci_writel(host,val, SDHCI_TEGRA_AUTO_CAL_CONFIG); + if (ret) + dev_err(mmc_dev(host->mmc), "Pad autocal timed out\n"); } static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) -- 2.18.0