Skip to contentSkip to conversation

mmc: sdhci-of-esdhc: make sure delay chain locked for HS400

PATCH Superseded Yangbo Lu 2 participants 3 messages Oct 16, 2020 – Oct 20, 2020

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Yangbo Lu

author
#0 lore raw

PATCH 1/1 mmc: sdhci-of-esdhc: make sure delay chain locked for HS400

For eMMC HS400 mode initialization, the DLL reset is a required step if DLL is enabled to use previously, like in bootloader. This step has not been documented in reference manual, but the RM will be fixed sooner or later.

This patch is to add the step of DLL reset, and make sure delay chain locked for HS400.

---
 drivers/mmc/host/sdhci-esdhc.h    |  2 ++
 drivers/mmc/host/sdhci-of-esdhc.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
drivers/mmc/host/sdhci-esdhc.h +2 -0
index a30796e..6de02f0 100644
@@ -5,6 +5,7 @@
  * Copyright (c) 2007 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
  * Copyright (c) 2010 Pengutronix e.K.
+ * Copyright 2020 NXP
  *   Author: Wolfram Sang <[email protected]>
  */
 
@@ -88,6 +89,7 @@
 /* DLL Config 0 Register */
 #define ESDHC_DLLCFG0			0x160
 #define ESDHC_DLL_ENABLE		0x80000000
+#define ESDHC_DLL_RESET			0x40000000
 #define ESDHC_DLL_FREQ_SEL		0x08000000
 
 /* DLL Config 1 Register */
drivers/mmc/host/sdhci-of-esdhc.c +24 -0
index 0b45eff..a39ff86 100644
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2007, 2010, 2012 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
+ * Copyright 2020 NXP
  *
  * Authors: Xiaobo Xie <[email protected]>
  *	    Anton Vorontsov <[email protected]>
@@ -743,6 +744,29 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
 		if (host->mmc->actual_clock == MMC_HS200_MAX_DTR)
 			temp |= ESDHC_DLL_FREQ_SEL;
 		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		temp |= ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+		udelay(1);
+		temp &= ~ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		/* Wait max 20 ms */
+		timeout = ktime_add_ms(ktime_get(), 20);
+		while (1) {
+			bool timedout = ktime_after(ktime_get(), timeout);
+
+			if (sdhci_readl(host, ESDHC_DLLSTAT0) &
+			    ESDHC_DLL_STS_SLV_LOCK)
+				break;
+			if (timedout) {
+				pr_err("%s: timeout for delay chain lock.\n",
+					mmc_hostname(host->mmc));
+				break;
+			}
+			usleep_range(10, 20);
+		}
+
 		temp = sdhci_readl(host, ESDHC_TBCTL);
 		sdhci_writel(host, temp | ESDHC_HS400_WNDW_ADJUST, ESDHC_TBCTL);
 
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 62 lines · Yangbo Lu

For eMMC HS400 mode initialization, the DLL reset is a required step if DLL is enabled to use previously, like in bootloader. This step has not been documented in reference manual, but the RM will be fixed sooner or later.

This patch is to add the step of DLL reset, and make sure delay chain locked for HS400.

---
 drivers/mmc/host/sdhci-esdhc.h    |  2 ++
 drivers/mmc/host/sdhci-of-esdhc.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
drivers/mmc/host/sdhci-esdhc.h +2 -0
index a30796e..6de02f0 100644
@@ -5,6 +5,7 @@
  * Copyright (c) 2007 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
  * Copyright (c) 2010 Pengutronix e.K.
+ * Copyright 2020 NXP
  *   Author: Wolfram Sang <[email protected]>
  */
 
@@ -88,6 +89,7 @@
 /* DLL Config 0 Register */
 #define ESDHC_DLLCFG0			0x160
 #define ESDHC_DLL_ENABLE		0x80000000
+#define ESDHC_DLL_RESET			0x40000000
 #define ESDHC_DLL_FREQ_SEL		0x08000000
 
 /* DLL Config 1 Register */
drivers/mmc/host/sdhci-of-esdhc.c +13 -0
index 0b45eff..a39ff86 100644
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2007, 2010, 2012 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
+ * Copyright 2020 NXP
  *
  * Authors: Xiaobo Xie <[email protected]>
  *	    Anton Vorontsov <[email protected]>
@@ -743,6 +744,29 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
 		if (host->mmc->actual_clock == MMC_HS200_MAX_DTR)
 			temp |= ESDHC_DLL_FREQ_SEL;
 		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		temp |= ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+		udelay(1);
+		temp &= ~ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		/* Wait max 20 ms */
+		timeout = ktime_add_ms(ktime_get(), 20);
+		while (1) {
+			bool timedout = ktime_after(ktime_get(), timeout);
+

drivers/mmc/host/sdhci-of-esdhc.c static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) · line 768

Quoted 10 lines
drivers/mmc/host/sdhci-of-esdhc.c +10 -0
+			if (sdhci_readl(host, ESDHC_DLLSTAT0) &
+			    ESDHC_DLL_STS_SLV_LOCK)
+				break;
+			if (timedout) {
+				pr_err("%s: timeout for delay chain lock.\n",
+					mmc_hostname(host->mmc));
+				break;
+			}
+			usleep_range(10, 20);
+		}

It is possible now to do these loops using read_poll_timeout e.g. something like this:

	if (read_poll_timeout(sdhci_readl, temp, temp & ESDHC_DLL_STS_SLV_LOCK,
			      10, 20000, false, host, ESDHC_DLLSTAT0))
		pr_err("%s: timeout for delay chain lock.\n",
		       mmc_hostname(host->mmc));
Quoted 5 lines
drivers/mmc/host/sdhci-of-esdhc.c +1 -0
+
 		temp = sdhci_readl(host, ESDHC_TBCTL);
 		sdhci_writel(host, temp | ESDHC_HS400_WNDW_ADJUST, ESDHC_TBCTL);
 
author
#2 lore raw

Hi Adrian,

Quoted 88 lines

-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: Friday, October 16, 2020 5:06 PM
To: Y.b. Lu <[email protected]>; [email protected]
Cc: Ulf Hansson <[email protected]>
Subject: Re: [PATCH] mmc: sdhci-of-esdhc: make sure delay chain locked for HS400

Quoted 8 lines · Yangbo Lu

For eMMC HS400 mode initialization, the DLL reset is a required step if DLL is enabled to use previously, like in bootloader. This step has not been documented in reference manual, but the RM will be fixed sooner or later.

This patch is to add the step of DLL reset, and make sure delay chain locked for HS400.

Review

Quoted 7 lines
---
 drivers/mmc/host/sdhci-esdhc.h    |  2 ++
 drivers/mmc/host/sdhci-of-esdhc.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-esdhc.h

Review

Quoted 20 lines

index a30796e..6de02f0 100644

drivers/mmc/host/sdhci-esdhc.h +2 -0
@@ -5,6 +5,7 @@
  * Copyright (c) 2007 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
  * Copyright (c) 2010 Pengutronix e.K.
+ * Copyright 2020 NXP
  *   Author: Wolfram Sang <[email protected]>
  */
 
@@ -88,6 +89,7 @@
 /* DLL Config 0 Register */
 #define ESDHC_DLLCFG0			0x160
 #define ESDHC_DLL_ENABLE		0x80000000
+#define ESDHC_DLL_RESET			0x40000000
 #define ESDHC_DLL_FREQ_SEL		0x08000000
 
 /* DLL Config 1 Register */
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-of-esdhc.c

drivers/mmc/host/sdhci-of-esdhc.c static void esdhc_of_set_clock(struct sdhci_host

Quoted 12 lines

index 0b45eff..a39ff86 100644

drivers/mmc/host/sdhci-of-esdhc.c +1 -0
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2007, 2010, 2012 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
+ * Copyright 2020 NXP
  *
  * Authors: Xiaobo Xie <[email protected]>
  *	    Anton Vorontsov <[email protected]>
@@ -743,6 +744,29 @@ static void esdhc_of_set_clock(struct sdhci_host

*host, unsigned int clock)

Quoted 15 lines
drivers/mmc/host/sdhci-of-esdhc.c +12 -0
 		if (host->mmc->actual_clock == MMC_HS200_MAX_DTR)
 			temp |= ESDHC_DLL_FREQ_SEL;
 		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		temp |= ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+		udelay(1);
+		temp &= ~ESDHC_DLL_RESET;
+		sdhci_writel(host, temp, ESDHC_DLLCFG0);
+
+		/* Wait max 20 ms */
+		timeout = ktime_add_ms(ktime_get(), 20);
+		while (1) {
+			bool timedout = ktime_after(ktime_get(), timeout);
+

drivers/mmc/host/sdhci-of-esdhc.c static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) · line 768

Quoted 10 lines
drivers/mmc/host/sdhci-of-esdhc.c +10 -0
+			if (sdhci_readl(host, ESDHC_DLLSTAT0) &
+			    ESDHC_DLL_STS_SLV_LOCK)
+				break;
+			if (timedout) {
+				pr_err("%s: timeout for delay chain lock.\n",
+					mmc_hostname(host->mmc));
+				break;
+			}
+			usleep_range(10, 20);
+		}

It is possible now to do these loops using read_poll_timeout e.g. something like this:

Quoted 5 lines

if (read_poll_timeout(sdhci_readl, temp, temp &
ESDHC_DLL_STS_SLV_LOCK,

			      10, 20000, false, host, ESDHC_DLLSTAT0))
		pr_err("%s: timeout for delay chain lock.\n",
		       mmc_hostname(host->mmc));

Thank you very much.
I sent out v2 converting to use it.

Quoted 9 lines

drivers/mmc/host/sdhci-of-esdhc.c static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)

Quoted 6 lines
drivers/mmc/host/sdhci-of-esdhc.c +1 -0
+
 		temp = sdhci_readl(host, ESDHC_TBCTL);
 		sdhci_writel(host, temp | ESDHC_HS400_WNDW_ADJUST,

ESDHC_TBCTL);

Quoted 2 lines