Skip to contentSkip to conversation

mmc: fsl_esdhc_imx: Auto-detect higher speeds

PATCH In review Adam Ford 4 participants 8 messages Jan 12, 2022 – Feb 19, 2022

Subsystems (2)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

cover mmc: fsl_esdhc_imx: Auto-detect higher speeds

The driver in the Linux kernel can automatically detect high speed options like UHS, HS200, HS400 and HS400-ES without needing to add special flags to the device tree.

UHS appears to have been broken in this driver, so fix UHS support, and add auto-detection.

Adam Ford (2):
mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0
mmc: fsl_esdhc_imx: Use esdhc_soc_data flags to set host caps

 drivers/mmc/fsl_esdhc_imx.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

According to Haibo Chen [1] - the current implementation mmc_wait_dat0, the second mmc_wait_dat0() in mmc_switch_voltage() always return timeout. This causes UHS cards to not properly initialize to their highest rate, and default back for high-speed mode.

When reviewing [1] and comparing it to the linux driver, it appears that this function can be accomplished by turning off the clock, and waiting for the clock-standby bit to become active.

[1] - https://lists.denx.de/pipermail/u-boot/2021-January/438644.html

drivers/mmc/fsl_esdhc_imx.c +7 -1
index 4c06361bee..e5814232a2 100644
@@ -1684,9 +1684,15 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev, int state,
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 
+	/*
+	 * Clear the clock-enable and wait for the bit indicating it
+	 * is in standby.
+	 */
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,
-				!!(tmp & PRSSTAT_DAT0) == !!state,
+				(tmp & PRSSTAT_SDSTB),
 				timeout_us);
+
 	return ret;
 }
 
Signature · 1 line
2.32.0
#2 lore raw

RE: [PATCH 1/2] mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

Quoted 11 lines

-----Original Message-----
From: Adam Ford [mailto:[email protected]]
Sent: 2022年1月12日 21:54
To: [email protected]
Cc: Peng Fan <[email protected]>; Bough Chen <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Adam Ford <[email protected]>
Subject: [PATCH 1/2] mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

According to Haibo Chen [1] - the current implementation mmc_wait_dat0,

the

Quoted 2 lines

second mmc_wait_dat0() in mmc_switch_voltage() always return timeout. This causes UHS cards to not properly initialize to their highest rate,

and

Quoted 3 lines

default back for high-speed mode.

When reviewing [1] and comparing it to the linux driver, it appears that

this

drivers/mmc/fsl_esdhc_imx.c

Quoted 16 lines

function can be accomplished by turning off the clock, and waiting for the clock-standby bit to become active.

[1] -
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.de
nx.de%2Fpipermail%2Fu-boot%2F2021-January%2F438644.html&amp;data=04 %7C01%7Chaibo.chen%40nxp.com%7C5de948ddd6fb41a9ab2c08d9d5d304d9 %7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63777592456049525 1%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiL CJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=QVXYNWR3t2N9oCr BZSnoJVquwWdJuvo0hmuP%2FZhZifc%3D&amp;reserved=0

drivers/mmc/fsl_esdhc_imx.c +0 -0

index

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_wait_dat0(struct udevice *dev, · line 1692

Quoted 13 lines

4c06361bee..e5814232a2 100644

drivers/mmc/fsl_esdhc_imx.c +5 -0
@@ -1684,9 +1684,15 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev,
 int state,
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 
+	/*
+	 * Clear the clock-enable and wait for the bit indicating it
+	 * is in standby.
+	 */
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);

Hi Adam,

For the usdhc on i.MX, the bit VENDORSPEC_CKEN is not implement by IP, instead, we use the bit 8 of register 0xc0.

By the way, for the wait_dat0 function, it not only cover the IO voltage switch process, other place also need this function. So I think this change is not correct.

Best Regards
Haibo Chen

Quoted 10 lines
drivers/mmc/fsl_esdhc_imx.c +2 -2
 	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,
-				!!(tmp & PRSSTAT_DAT0) == !!state,
+				(tmp & PRSSTAT_SDSTB),
 				timeout_us);
+
 	return ret;
 }
 
--

2.32.0

#3 lore raw

PATCH 1/2 mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

In reply to Adam Ford
Quoted 21 lines

According to Haibo Chen [1] - the current implementation mmc_wait_dat0, the second mmc_wait_dat0() in mmc_switch_voltage() always return timeout. This causes UHS cards to not properly initialize to their highest rate, and default back for high-speed mode.
When reviewing [1] and comparing it to the linux driver, it appears that this function can be accomplished by turning off the clock, and waiting for the clock-standby bit to become active.
[1] - https://lists.denx.de/pipermail/u-boot/2021-January/438644.html

drivers/mmc/fsl_esdhc_imx.c +3 -0
index 4c06361bee..e5814232a2 100644
@@ -1684,9 +1684,15 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev, int state,
 	struct fsl_esdhc_priv *priv = dev_get_priv(dev);
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 
+	/*
+	 * Clear the clock-enable and wait for the bit indicating it
+	 * is in standby.

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_wait_dat0(struct udevice *dev, int state, · line 1698

Quoted 10 lines
drivers/mmc/fsl_esdhc_imx.c +4 -1
+	 */
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,
-				!!(tmp & PRSSTAT_DAT0) == !!state,
+				(tmp & PRSSTAT_SDSTB),
 				timeout_us);
+
 	return ret;
 }
 

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
reviewer
#4 lore raw

Re: [PATCH 1/2] mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

Hi Stefano,

Quoted 19 lines · On Sat, Feb 19, 2022 at 10:08 AM <[email protected]> wrote:
Quoted 19 lines

According to Haibo Chen [1] - the current implementation mmc_wait_dat0, the second mmc_wait_dat0() in mmc_switch_voltage() always return timeout. This causes UHS cards to not properly initialize to their highest rate, and default back for high-speed mode.
When reviewing [1] and comparing it to the linux driver, it appears that this function can be accomplished by turning off the clock, and waiting for the clock-standby bit to become active.
[1] - https://lists.denx.de/pipermail/u-boot/2021-January/438644.html

drivers/mmc/fsl_esdhc_imx.c +0 -0
index 4c06361bee..e5814232a2 100644
@@ -1684,9 +1684,15 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev, int state,
      struct fsl_esdhc_priv *priv = dev_get_priv(dev);
      struct fsl_esdhc *regs = priv->esdhc_regs;
 
Quoted 14 lines

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_wait_dat0(struct udevice *dev, int state, · line 1698

Quoted 13 lines
drivers/mmc/fsl_esdhc_imx.c +7 -1
+     /*
+      * Clear the clock-enable and wait for the bit indicating it
+      * is in standby.
+      */
+     esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
      ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,
-                             !!(tmp & PRSSTAT_DAT0) == !!state,
+                             (tmp & PRSSTAT_SDSTB),
                              timeout_us);
+
      return ret;
 }
 

Applied to u-boot-imx, master, thanks !

Bough said this patch is incorrect during the review.

#5 lore raw

Re: [PATCH 1/2] mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0

Hi Fabio,

Quoted 37 lines · Fabio Estevam

Hi Stefano,

Quoted 19 lines · On Sat, Feb 19, 2022 at 10:08 AM <[email protected]> wrote:
Quoted 19 lines

According to Haibo Chen [1] - the current implementation mmc_wait_dat0, the second mmc_wait_dat0() in mmc_switch_voltage() always return timeout. This causes UHS cards to not properly initialize to their highest rate, and default back for high-speed mode.
When reviewing [1] and comparing it to the linux driver, it appears that this function can be accomplished by turning off the clock, and waiting for the clock-standby bit to become active.
[1] - https://lists.denx.de/pipermail/u-boot/2021-January/438644.html

drivers/mmc/fsl_esdhc_imx.c +0 -0
index 4c06361bee..e5814232a2 100644
@@ -1684,9 +1684,15 @@ static int fsl_esdhc_wait_dat0(struct udevice *dev, int state,
       struct fsl_esdhc_priv *priv = dev_get_priv(dev);
       struct fsl_esdhc *regs = priv->esdhc_regs;
 
Quoted 14 lines

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_wait_dat0(struct udevice *dev, int state, · line 1698

Quoted 13 lines
drivers/mmc/fsl_esdhc_imx.c +7 -1
+     /*
+      * Clear the clock-enable and wait for the bit indicating it
+      * is in standby.
+      */
+     esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
       ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,
-                             !!(tmp & PRSSTAT_DAT0) == !!state,
+                             (tmp & PRSSTAT_SDSTB),
                               timeout_us);
+
       return ret;
  }
 

Applied to u-boot-imx, master, thanks !

Quoted 1 line

Bough said this patch is incorrect during the review.

Ouch, I have seen it was tested, I missed Bough's comment. I revert it and I ask Tom to wait - and nevertheless, I delegate these to Peng, this is his area of competence.

Best regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
author
#6 lore raw

PATCH 2/2 mmc: fsl_esdhc_imx: Use esdhc_soc_data flags to set host caps

In reply to Adam Ford

The Linux driver automatically can detect and enable UHS, HS200, HS400 and HS400_ES automatically without extra flags being placed into the device tree.

Right now, for U-Boot to use UHS, HS200 or HS400, the extra flags are needed in the device tree. Instead, go through the esdhc_soc_data flags and enable the host caps where applicable to automatically enable higher speeds.

drivers/mmc/fsl_esdhc_imx.c +22 -1
index e5814232a2..5088e78bb6 100644
@@ -1305,8 +1305,29 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
 			val |= ESDHC_TUNING_CMD_CRC_CHECK_DISABLE;
 			esdhc_write32(&regs->tuning_ctrl, val);
 		}
-	}
 
+		/*
+		 * UHS doesn't have explicit ESDHC flags, so if it's
+		 * not supported, disable it in config.
+		 */
+		if (CONFIG_IS_ENABLED(MMC_UHS_SUPPORT))
+			cfg->host_caps |= UHS_CAPS;
+
+		if (CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS200)
+				cfg->host_caps |= MMC_CAP(MMC_HS_200);
+		}
+
+		if (CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS400)
+				cfg->host_caps |= MMC_CAP(MMC_HS_400);
+		}
+
+		if (CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS400_ES)
+				cfg->host_caps |= MMC_CAP(MMC_HS_400_ES);
+		}
+	}
 	return 0;
 }
 
Signature · 1 line
2.32.0
#7 lore raw

PATCH 2/2 mmc: fsl_esdhc_imx: Use esdhc_soc_data flags to set host caps

Quoted 34 lines

The Linux driver automatically can detect and enable UHS, HS200, HS400 and HS400_ES automatically without extra flags being placed into the device tree.
Right now, for U-Boot to use UHS, HS200 or HS400, the extra flags are needed in the device tree. Instead, go through the esdhc_soc_data flags and enable the host caps where applicable to automatically enable higher speeds.

drivers/mmc/fsl_esdhc_imx.c +15 -1
index e5814232a2..5088e78bb6 100644
@@ -1305,8 +1305,29 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
 			val |= ESDHC_TUNING_CMD_CRC_CHECK_DISABLE;
 			esdhc_write32(&regs->tuning_ctrl, val);
 		}
-	}
 
+		/*
+		 * UHS doesn't have explicit ESDHC flags, so if it's
+		 * not supported, disable it in config.
+		 */
+		if (CONFIG_IS_ENABLED(MMC_UHS_SUPPORT))
+			cfg->host_caps |= UHS_CAPS;
+
+		if (CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS200)
+				cfg->host_caps |= MMC_CAP(MMC_HS_200);
+		}
+
+		if (CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS400)
+				cfg->host_caps |= MMC_CAP(MMC_HS_400);

drivers/mmc/fsl_esdhc_imx.c static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, · line 1333

Quoted 10 lines
drivers/mmc/fsl_esdhc_imx.c +7 -0
+		}
+
+		if (CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)) {
+			if (priv->flags & ESDHC_FLAG_HS400_ES)
+				cfg->host_caps |= MMC_CAP(MMC_HS_400_ES);
+		}
+	}
 	return 0;
 }
 

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================