From: Elad Nachman <enachman@marvell.com>
To: <huziji@marvell.com>, <ulf.hansson@linaro.org>,
<adrian.hunter@intel.com>, <linux-mmc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <enachman@marvell.com>
Subject: [PATCH 1/2] mmc: xenon: fix PHY init clock stability
Date: Wed, 7 Feb 2024 19:04:24 +0200 [thread overview]
Message-ID: <20240207170425.478558-2-enachman@marvell.com> (raw)
In-Reply-To: <20240207170425.478558-1-enachman@marvell.com>
From: Elad Nachman <enachman@marvell.com>
Each time SD/mmc phy is initialized, at times, in some of
the attempts, phy fails to completes its initialization
which results into timeout error. Per the HW spec, it is
a pre-requisite to ensure a stable SD clock before a phy
initialization is attempted.
Signed-off-by: Elad Nachman <enachman@marvell.com>
---
drivers/mmc/host/sdhci-xenon-phy.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c
index 8cf3a375de65..4e99197b62c3 100644
--- a/drivers/mmc/host/sdhci-xenon-phy.c
+++ b/drivers/mmc/host/sdhci-xenon-phy.c
@@ -216,6 +216,24 @@ static int xenon_alloc_emmc_phy(struct sdhci_host *host)
return 0;
}
+static int xenon_check_stability_internal_clk(struct sdhci_host *host)
+{
+ u32 reg;
+ ktime_t timeout;
+
+ /* Wait max 20 ms */
+ timeout = ktime_add_ms(ktime_get(), 20);
+ while (!((reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
+ & SDHCI_CLOCK_INT_STABLE)) {
+ if (ktime_after(ktime_get(), timeout)) {
+ dev_err(mmc_dev(host->mmc), "phy_init: Internal clock never stabilized.\n");
+ return -ETIMEDOUT;
+ }
+ usleep_range(900, 1100);
+ }
+ return 0;
+}
+
/*
* eMMC 5.0/5.1 PHY init/re-init.
* eMMC PHY init should be executed after:
@@ -232,6 +250,11 @@ static int xenon_emmc_phy_init(struct sdhci_host *host)
struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
struct xenon_emmc_phy_regs *phy_regs = priv->emmc_phy_regs;
+ int ret = xenon_check_stability_internal_clk(host);
+
+ if (ret)
+ return ret;
+
reg = sdhci_readl(host, phy_regs->timing_adj);
reg |= XENON_PHY_INITIALIZAION;
sdhci_writel(host, reg, phy_regs->timing_adj);
--
2.25.1
next prev parent reply other threads:[~2024-02-07 17:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 17:04 [PATCH 0/2] Fix PHY init timeout issues Elad Nachman
2024-02-07 17:04 ` Elad Nachman [this message]
2024-02-07 17:23 ` [PATCH 1/2] mmc: xenon: fix PHY init clock stability Ulf Hansson
2024-02-07 17:04 ` [PATCH 2/2] mmc: xenon: add timeout for PHY init complete Elad Nachman
2024-02-07 17:25 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240207170425.478558-2-enachman@marvell.com \
--to=enachman@marvell.com \
--cc=adrian.hunter@intel.com \
--cc=huziji@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox