Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp283941imm; Fri, 10 Aug 2018 11:10:52 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxpuRUEi9eoXOkwonUXeQMEp6wy+9lJW4ncHu2yhw5+pnX/lW3OckvvAVLE//K1VjwVqhu6 X-Received: by 2002:a62:1c13:: with SMTP id c19-v6mr8093538pfc.148.1533924652613; Fri, 10 Aug 2018 11:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533924652; cv=none; d=google.com; s=arc-20160816; b=OaVtfViV0EbeRys5hYRCTyFolnH1iUd2UJgXxxS1PHK/6Q9sDORID1N75G7RF1puuU hb1+tcVj2JIk+08/XS3F4dxzImscWjn2tyukT3RUHIauhZjJrMNd4jxoRga7d7nze3aq VzP4PSKGptdhZAD6PT8Y+Tje1RPOZdJkyVojRCbHr7m1Vy8c5qWpSEIj7HijGo365dj3 1gJKAyygf3X2AkshOqfsDdFMQM4Ob0gNSEl0TcvSDPj9pHjHAZm34ZCATuS8CX3YTXBR i2+bxCCWouo2cwwjCdCV2M3QmTLpPJQlZOJxaYU94zEjUnIbrclc+tdhtxl3VN5Ubyp+ OyzA== 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=TIxLTJO9/Y2JTKK/mF/bsH4Nw34EF0HXtM5UWOLI2zI=; b=bZbGY2gjSxlMiiAD+Cy+3fCuPjH0BdgX75ttIJto1UIcrs7QvEEJOcscCce22xB98k baOEtq01QJWAoiOasbUDO1aEhJ4Nsl9nQdWlWPOWlYqtaEY+gvnTfJ81pdHN26MpdvLO CxHCnsL88JHkTn/U5YjpdIkrSJluOZ5XXKBLoQAMvr4iZa1eeIUApOBG9i0xMiEwYG/T Y4Vzz78tdju/BAub37sXdEWIuXLFZfBCyw5KJp/S6wlVWS+pcKiDBpyXuqEB3wtwOHcW xh5WGLoPf5eiZgKMlSgvba/rUyTQeGTwb22cjd3fTnwj9OPVq/BgVspYvDHYDmaptnqd 8gkA== 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 y8-v6si9267662pfm.141.2018.08.10.11.10.37; Fri, 10 Aug 2018 11:10:52 -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 S1729975AbeHJUkY (ORCPT + 99 others); Fri, 10 Aug 2018 16:40:24 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:3543 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729666AbeHJUkY (ORCPT ); Fri, 10 Aug 2018 16:40:24 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Fri, 10 Aug 2018 11:09:25 -0700 Received: from HQMAIL108.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 10 Aug 2018 11:09:28 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 10 Aug 2018 11:09:28 -0700 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 10 Aug 2018 18:09:28 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2 via Frontend Transport; Fri, 10 Aug 2018 18:09:28 +0000 Received: from dhcp-10-21-25-168.Nvidia.com (Not Verified[10.21.25.201]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 10 Aug 2018 11:09:28 -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 v2 13/40] mmc: tegra: Poll for calibration completion Date: Fri, 10 Aug 2018 21:08:15 +0300 Message-ID: <1533924522-1037-14-git-send-email-avienamo@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> References: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> X-NVConfidentiality: public 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 --- 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 5e7f9ba..a62a3fc 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.7.4