Skip to contentSkip to conversation

Revert "mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output"

PATCH Applied Fabio Estevam 5 participants 14 messages Jun 7, 2021 – Jun 22, 2021

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/1 Revert "mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output"

This reverts commit 63756575b42b8b4fb3f59cbbf0cedf03331bc2d2.

Since this commit a imx6qdl-pico board boots extremely slowly in both SPL as well as U-Boot proper.

Fix this regression by reverting the offending commit for now.

---
Changes since v1:
- Include the author of the offending commit on Cc.

 drivers/mmc/fsl_esdhc_imx.c | 29 ++++++++---------------------
 include/fsl_esdhc_imx.h     |  2 --
 2 files changed, 8 insertions(+), 23 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +8 -21
index a4675838e58a..b49d5ede2711 100644
@@ -653,10 +653,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
 	clk = (pre_div << 8) | (div << 4);
 
 #ifdef CONFIG_FSL_USDHC
-	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-	if (ret)
-		pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 #else
 	esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN);
 #endif
@@ -668,7 +665,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
 		pr_warn("fsl_esdhc_imx: Internal clock never stabilised.\n");
 
 #ifdef CONFIG_FSL_USDHC
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_CKEN);
 #else
 	esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
 #endif
@@ -723,14 +720,8 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)
 	struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev);
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 	u32 val;
-	u32 tmp;
-	int ret;
 
 	if (priv->clock > ESDHC_STROBE_DLL_CLK_FREQ) {
-		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
 		esdhc_write32(&regs->strobe_dllctrl, ESDHC_STROBE_DLL_CTRL_RESET);
 
 		/*
@@ -748,7 +739,6 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)
 			pr_warn("HS400 strobe DLL status REF not lock!\n");
 		if (!(val & ESDHC_STROBE_DLL_STS_SLV_LOCK))
 			pr_warn("HS400 strobe DLL status SLV not lock!\n");
-		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
 	}
 }
 
@@ -980,18 +970,14 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
 #ifdef MMC_SUPPORTS_TUNING
 	if (mmc->clk_disable) {
 #ifdef CONFIG_FSL_USDHC
-		u32 tmp;
-
-		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
+		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 #else
 		esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN);
 #endif
 	} else {
 #ifdef CONFIG_FSL_USDHC
-		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+				VENDORSPEC_CKEN);
 #else
 		esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
 #endif
@@ -1067,7 +1053,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
 #ifndef CONFIG_FSL_USDHC
 	esdhc_setbits32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
 #else
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_HCKEN | VENDORSPEC_IPGEN);
 #endif
 
 	/* Set the initial clock speed */
@@ -1205,7 +1191,8 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
 	esdhc_write32(&regs->autoc12err, 0);
 	esdhc_write32(&regs->clktunectrlstatus, 0);
 #else
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+			VENDORSPEC_HCKEN | VENDORSPEC_IPGEN | VENDORSPEC_CKEN);
 #endif
 
 	if (priv->vs18_enable)
include/fsl_esdhc_imx.h +0 -2
index b0920344641c..45ed635a77bf 100644
@@ -39,7 +39,6 @@
 #define VENDORSPEC_HCKEN	0x00001000
 #define VENDORSPEC_IPGEN	0x00000800
 #define VENDORSPEC_INIT		0x20007809
-#define VENDORSPEC_FRC_SDCLK_ON 0x00000100
 
 #define IRQSTAT			0x0002e030
 #define IRQSTAT_DMAE		(0x10000000)
@@ -97,7 +96,6 @@
 #define PRSSTAT_CINS		(0x00010000)
 #define PRSSTAT_BREN		(0x00000800)
 #define PRSSTAT_BWEN		(0x00000400)
-#define PRSSTAT_SDOFF		(0x00000080)
 #define PRSSTAT_SDSTB		(0X00000008)
 #define PRSSTAT_DLA		(0x00000004)
 #define PRSSTAT_CICHB		(0x00000002)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Fabio Estevam [mailto:[email protected]]
Sent: 2021年6月8日 4:40
To: Peng Fan <[email protected]>
Cc: Bough Chen <[email protected]>; [email protected]; [email protected]; Fabio Estevam <[email protected]>
Subject: [PATCH v2] Revert "mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output"

Quoted 6 lines

This reverts commit 63756575b42b8b4fb3f59cbbf0cedf03331bc2d2.

Since this commit a imx6qdl-pico board boots extremely slowly in both SPL as well as U-Boot proper.

Fix this regression by reverting the offending commit for now.

Hi Fabio,

Force clock on did help us fix some issue, like voltage switch for UHS card. According to your commit log, seems this patch affect the booting time, do you mean
the API readx_poll_timeout() cost a lot time? Can you show us the detail info about
booting time effected by this patch?

Regards,
Haibo Chen

Quoted 26 lines

---
Changes since v1:
- Include the author of the offending commit on Cc.

 drivers/mmc/fsl_esdhc_imx.c | 29 ++++++++---------------------
 include/fsl_esdhc_imx.h     |  2 --
 2 files changed, 8 insertions(+), 23 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +1 -4
index a4675838e58a..b49d5ede2711 100644
@@ -653,10 +653,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv,
 struct mmc *mmc, uint clock)
 	clk = (pre_div << 8) | (div << 4);
 
 #ifdef CONFIG_FSL_USDHC
-	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp &
 PRSSTAT_SDOFF, 100);
-	if (ret)
-		pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 #else
Quoted 4 lines

esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN); #endif @@ -668,7
+665,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
pr_warn("fsl_esdhc_imx: Internal clock never

stabilised.\n");

Quoted 18 lines

#ifdef CONFIG_FSL_USDHC

drivers/mmc/fsl_esdhc_imx.c +2 -1
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+VENDORSPEC_CKEN);
 #else
 	esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);

#endif @@ -723,14 +720,8 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)

drivers/mmc/fsl_esdhc_imx.c +0 -3
 	struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev);
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 	u32 val;
-	u32 tmp;
-	int ret;
 
 	if (priv->clock > ESDHC_STROBE_DLL_CLK_FREQ) {
-		esdhc_clrbits32(&regs->vendorspec,

VENDORSPEC_FRC_SDCLK_ON);

drivers/mmc/fsl_esdhc_imx.c

Quoted 1 line
drivers/mmc/fsl_esdhc_imx.c +0 -1
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,

tmp

drivers/mmc/fsl_esdhc_imx.c

Quoted 3 lines

& PRSSTAT_SDOFF, 100);

drivers/mmc/fsl_esdhc_imx.c +0 -2
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate

off.\n");

Quoted 21 lines

esdhc_write32(&regs->strobe_dllctrl,
ESDHC_STROBE_DLL_CTRL_RESET);

drivers/mmc/fsl_esdhc_imx.c +0 -1
 		/*
@@ -748,7 +739,6 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)
 			pr_warn("HS400 strobe DLL status REF not lock!\n");
 		if (!(val & ESDHC_STROBE_DLL_STS_SLV_LOCK))
 			pr_warn("HS400 strobe DLL status SLV not lock!\n");
-		esdhc_setbits32(&regs->vendorspec,
 VENDORSPEC_FRC_SDCLK_ON);
 	}
 }
@@ -980,18 +970,14 @@ static int esdhc_set_ios_common(struct

fsl_esdhc_priv *priv, struct mmc *mmc) #ifdef MMC_SUPPORTS_TUNING

drivers/mmc/fsl_esdhc_imx.c +0 -3
 	if (mmc->clk_disable) {
 #ifdef CONFIG_FSL_USDHC
-		u32 tmp;
-
-		esdhc_clrbits32(&regs->vendorspec,

VENDORSPEC_FRC_SDCLK_ON);

drivers/mmc/fsl_esdhc_imx.c

Quoted 1 line
drivers/mmc/fsl_esdhc_imx.c +0 -1
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp,

tmp

drivers/mmc/fsl_esdhc_imx.c

Quoted 3 lines

& PRSSTAT_SDOFF, 100);

drivers/mmc/fsl_esdhc_imx.c +0 -2
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate

off.\n");

Quoted 54 lines
drivers/mmc/fsl_esdhc_imx.c +1 -1
+		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
 #else
 		esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN);  #endif
 	} else {
 #ifdef CONFIG_FSL_USDHC
-		esdhc_setbits32(&regs->vendorspec,

VENDORSPEC_FRC_SDCLK_ON);

drivers/mmc/fsl_esdhc_imx.c +2 -0
+		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+				VENDORSPEC_CKEN);
 #else
 		esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);

#endif @@ -1067,7 +1053,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) #ifndef CONFIG_FSL_USDHC
esdhc_setbits32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
#else

drivers/mmc/fsl_esdhc_imx.c +4 -2
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_HCKEN |
+VENDORSPEC_IPGEN);
 #endif
 
 	/* Set the initial clock speed */
@@ -1205,7 +1191,8 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv
 *priv,
 	esdhc_write32(&regs->autoc12err, 0);
 	esdhc_write32(&regs->clktunectrlstatus, 0);  #else
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+			VENDORSPEC_HCKEN | VENDORSPEC_IPGEN |
 VENDORSPEC_CKEN);
 #endif
 
drivers/mmc/fsl_esdhc_imx.c +0 -0
 	if (priv->vs18_enable)
include/fsl_esdhc_imx.h index renamed from include/fsl_esdhc_imx.h +0 -0

b0920344641c..45ed635a77bf 100644

include/fsl_esdhc_imx.h +0 -3
@@ -39,7 +39,6 @@
 #define VENDORSPEC_HCKEN	0x00001000
 #define VENDORSPEC_IPGEN	0x00000800
 #define VENDORSPEC_INIT		0x20007809
-#define VENDORSPEC_FRC_SDCLK_ON 0x00000100
 
 #define IRQSTAT			0x0002e030
 #define IRQSTAT_DMAE		(0x10000000)
@@ -97,7 +96,6 @@
 #define PRSSTAT_CINS		(0x00010000)
 #define PRSSTAT_BREN		(0x00000800)
 #define PRSSTAT_BWEN		(0x00000400)
-#define PRSSTAT_SDOFF		(0x00000080)
 #define PRSSTAT_SDSTB		(0X00000008)
 #define PRSSTAT_DLA		(0x00000004)
 #define PRSSTAT_CICHB		(0x00000002)
--

2.25.1

author reviewer
#2 lore raw

Hi Haibo,

Quoted 8 lines · Bough Chen

Hi Fabio,

Force clock on did help us fix some issue, like voltage switch for UHS card. According to your commit log, seems this patch affect the booting time, do you mean
the API readx_poll_timeout() cost a lot time? Can you show us the detail info about
booting time effected by this patch?

If I revert the patch SPL/U-Boot boot in one second.

With this patch, it takes around 20 seconds, which is unacceptable.

Thanks

#3 lore raw

Hi,

Quoted 13 lines · Fabio Estevam

Hi Haibo,

Quoted 8 lines · Bough Chen

Hi Fabio,

Force clock on did help us fix some issue, like voltage switch for UHS card. According to your commit log, seems this patch affect the booting time, do you mean
the API readx_poll_timeout() cost a lot time? Can you show us the detail info about
booting time effected by this patch?

Quoted 3 lines

If I revert the patch SPL/U-Boot boot in one second.

With this patch, it takes around 20 seconds, which is unacceptable.

Is your target success to boot finally after 20sec? I didn't have target to use fsl_esdhc_imx driver.

If booted after 20sec, how about below code?

#ifdef CONFIG_FSL_ESDHC_IMX_TIMEOUT
#define FSL_ESDHC_IMX_TIMEOUT CONFIG_FSL_ESDHC_IMX_TIMEOUT
#else
#define FSL_ESDHC_IMX_TIMEOUT 0
#endif

ret = readx_poll_timeout(..., FSL_ESDHC_IMX_TIMEOUT); if (FSL_ESDHC_IMX_TIMEOUT && ret)

	pr_warn("...");

If there isn't other issue,

Best Regards,
Jaehoon Chung

Quoted 3 lines

Thanks

author reviewer
#4 lore raw

Hi Jaehoon,

Quoted 1 line · Jaehoon Chung

Is your target success to boot finally after 20sec?

Yes, it boots fine after 20s.

Quoted 11 lines

I didn't have target to use fsl_esdhc_imx driver.

If booted after 20sec, how about below code?

#ifdef CONFIG_FSL_ESDHC_IMX_TIMEOUT
#define FSL_ESDHC_IMX_TIMEOUT CONFIG_FSL_ESDHC_IMX_TIMEOUT
#else
#define FSL_ESDHC_IMX_TIMEOUT 0
#endif

Quoted 3 lines

ret = readx_poll_timeout(..., FSL_ESDHC_IMX_TIMEOUT); if (FSL_ESDHC_IMX_TIMEOUT && ret)

        pr_warn("...");

Thanks for the suggestion, but it didn't work.

#5 lore raw

Hi Fabio,

Quoted 19 lines · Fabio Estevam

Hi Jaehoon,

Quoted 1 line · Jaehoon Chung

Is your target success to boot finally after 20sec?

Yes, it boots fine after 20s.

Quoted 11 lines

I didn't have target to use fsl_esdhc_imx driver.

If booted after 20sec, how about below code?

#ifdef CONFIG_FSL_ESDHC_IMX_TIMEOUT
#define FSL_ESDHC_IMX_TIMEOUT CONFIG_FSL_ESDHC_IMX_TIMEOUT
#else
#define FSL_ESDHC_IMX_TIMEOUT 0
#endif

Quoted 5 lines
Quoted 3 lines

ret = readx_poll_timeout(..., FSL_ESDHC_IMX_TIMEOUT); if (FSL_ESDHC_IMX_TIMEOUT && ret)

        pr_warn("...");

Thanks for the suggestion, but it didn't work.

If i find a board to use fs_esdhc_imx driver, I will check more. I hope that Bough will suggest better solution to satisfy both case.

Best Regards,
Jaehoon Chung

Quoted 1 line
#6 lore raw
Quoted 33 lines

-----Original Message-----
From: Jaehoon Chung [mailto:[email protected]]
Sent: 2021年6月9日 7:35
To: Fabio Estevam <[email protected]>
Cc: Bough Chen <[email protected]>; Peng Fan <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH v2] Revert "mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output"

Hi Fabio,

Quoted 3 lines · Fabio Estevam

Hi Jaehoon,

On Mon, Jun 7, 2021 at 11:50 PM Jaehoon Chung

Quoted 11 lines · <[email protected]> wrote:
Quoted 2 lines

Is your target success to boot finally after 20sec?

Yes, it boots fine after 20s.

Quoted 6 lines

I didn't have target to use fsl_esdhc_imx driver.

If booted after 20sec, how about below code?

#ifdef CONFIG_FSL_ESDHC_IMX_TIMEOUT
#define FSL_ESDHC_IMX_TIMEOUT

CONFIG_FSL_ESDHC_IMX_TIMEOUT

Quoted 5 lines
Quoted 5 lines

#else
#define FSL_ESDHC_IMX_TIMEOUT 0
#endif

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

ret = readx_poll_timeout(..., FSL_ESDHC_IMX_TIMEOUT); if (FSL_ESDHC_IMX_TIMEOUT && ret)

        pr_warn("...");

Thanks for the suggestion, but it didn't work.

If i find a board to use fs_esdhc_imx driver, I will check more. I hope that Bough will suggest better solution to satisfy both case.

Give me a few days, I'm busy these days, will do when I have time.

Best Regards
Bough

Quoted 5 lines

Best Regards,
Jaehoon Chung

Quoted 1 line
author reviewer
#7 lore raw

Hi Bough,

Quoted 1 line · Bough Chen

Give me a few days, I'm busy these days, will do when I have time.

We are already in 2021.04-rc4, so I think it is safer to go with the revert for now and then
you provide a proper fix later.

imx7s-warp is also affected by this.

#8 lore raw
In reply to Fabio Estevam

Hi Fabio

Quoted 13 lines · Fabio Estevam

Hi Haibo,

Quoted 8 lines · Bough Chen

Hi Fabio,

Force clock on did help us fix some issue, like voltage switch for UHS card. According to your commit log, seems this patch affect the booting time, do you mean
the API readx_poll_timeout() cost a lot time? Can you show us the detail info about
booting time effected by this patch?

Quoted 3 lines

If I revert the patch SPL/U-Boot boot in one second.

With this patch, it takes around 20 seconds, which is unacceptable.

Do you have a chance to see where it consumes so much time?

Thanks,
Peng.

Quoted 3 lines

Thanks

author reviewer
#9 lore raw

Hi Peng,

Quoted 1 line · Peng Fan (OSS)

Do you have a chance to see where it consumes so much time?

Here is the place it consumes too much time. Here is an example on a warp7 board:

U-Boot 2021.07-rc3 (Jun 17 2021 - 18:30:37 +0000)

CPU:   Freescale i.MX7S rev1.2 800 MHz (running at 792 MHz)
CPU:   Extended Commercial temperature grade (-20C to 105C) at 42C
Reset cause: POR
Model: Warp i.MX7 Board
Board: WARP7 in secure mode OPTEE DRAM 0x9d000000-0xa0000000
DRAM:  464 MiB
PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11
MMC:   FSL_SDHC: 3, FSL_SDHC: 0

Loading Environment from MMC... (takes 10 seconds to continue) OK

Can we go with the revert to avoid such regression?

Reviewed-by
#10 lore raw

Hi Fabio,

Quoted 19 lines · Fabio Estevam

Hi Peng,

Quoted 1 line · Peng Fan (OSS)

Do you have a chance to see where it consumes so much time?

Here is the place it consumes too much time. Here is an example on a warp7 board:

U-Boot 2021.07-rc3 (Jun 17 2021 - 18:30:37 +0000)

CPU:   Freescale i.MX7S rev1.2 800 MHz (running at 792 MHz)
CPU:   Extended Commercial temperature grade (-20C to 105C) at 42C
Reset cause: POR
Model: Warp i.MX7 Board
Board: WARP7 in secure mode OPTEE DRAM 0x9d000000-0xa0000000
DRAM:  464 MiB
PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11
MMC:   FSL_SDHC: 3, FSL_SDHC: 0
Quoted 3 lines

Loading Environment from MMC... (takes 10 seconds to continue) OK

Can we go with the revert to avoid such regression?

I think that this patch can be applied. Because it's too late to boot.

Best Regards,
Jaehoon Chung

Quoted 1 line
Tested-by on v2 1/1
#11 lore raw
In reply to Fabio Estevam

Hi Fabio,

Le 07/06/2021 à 22:40, Fabio Estevam a écrit :

Quoted 8 lines

This reverts commit 63756575b42b8b4fb3f59cbbf0cedf03331bc2d2.

Since this commit a imx6qdl-pico board boots extremely slowly in both SPL as well as U-Boot proper.

Fix this regression by reverting the offending commit for now.

This commit fixes the issue with the imx7s-warp.

Thanks,

Signature · 1 line
Piere-Jean Texier
author reviewer
#12 lore raw

Hi Peng/Tom,

Quoted 9 lines · Pierre-Jean Texier

Hi Fabio,

Quoted 5 lines · Fabio Estevam

This reverts commit 63756575b42b8b4fb3f59cbbf0cedf03331bc2d2.

Since this commit a imx6qdl-pico board boots extremely slowly in both SPL as well as U-Boot proper.

Quoted 7 lines
Quoted 3 lines

Fix this regression by reverting the offending commit for now.

This commit fixes the issue with the imx7s-warp.

The 2021.07 release is near and I would still like to see this patch applied to fix the regression.

It negatively affects the boot time of several i.MX boards.

Please consider applying it.

#13 lore raw
In reply to Fabio Estevam

Applied to mmc/master, awaiting upstream after CI.

Quoted 126 lines · Fabio Estevam

This reverts commit 63756575b42b8b4fb3f59cbbf0cedf03331bc2d2.

Since this commit a imx6qdl-pico board boots extremely slowly in both SPL as well as U-Boot proper.

Fix this regression by reverting the offending commit for now.

---
Changes since v1:
- Include the author of the offending commit on Cc.

  drivers/mmc/fsl_esdhc_imx.c | 29 ++++++++---------------------
  include/fsl_esdhc_imx.h     |  2 --
  2 files changed, 8 insertions(+), 23 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +8 -21
index a4675838e58a..b49d5ede2711 100644
@@ -653,10 +653,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
  	clk = (pre_div << 8) | (div << 4);
 
  #ifdef CONFIG_FSL_USDHC
-	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-	ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-	if (ret)
-		pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
+	esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
  #else
  	esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN);
  #endif
@@ -668,7 +665,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
  		pr_warn("fsl_esdhc_imx: Internal clock never stabilised.\n");
 
  #ifdef CONFIG_FSL_USDHC
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_CKEN);
  #else
  	esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
  #endif
@@ -723,14 +720,8 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)
  	struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev);
  	struct fsl_esdhc *regs = priv->esdhc_regs;
  	u32 val;
-	u32 tmp;
-	int ret;
 
  	if (priv->clock > ESDHC_STROBE_DLL_CLK_FREQ) {
-		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
  		esdhc_write32(&regs->strobe_dllctrl, ESDHC_STROBE_DLL_CTRL_RESET);
 
  		/*
@@ -748,7 +739,6 @@ static void esdhc_set_strobe_dll(struct mmc *mmc)
  			pr_warn("HS400 strobe DLL status REF not lock!\n");
  		if (!(val & ESDHC_STROBE_DLL_STS_SLV_LOCK))
  			pr_warn("HS400 strobe DLL status SLV not lock!\n");
-		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
  	}
  }
 
@@ -980,18 +970,14 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
  #ifdef MMC_SUPPORTS_TUNING
  	if (mmc->clk_disable) {
  #ifdef CONFIG_FSL_USDHC
-		u32 tmp;
-
-		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
-		ret = readx_poll_timeout(esdhc_read32, &regs->prsstat, tmp, tmp & PRSSTAT_SDOFF, 100);
-		if (ret)
-			pr_warn("fsl_esdhc_imx: Internal clock never gate off.\n");
+		esdhc_clrbits32(&regs->vendorspec, VENDORSPEC_CKEN);
  #else
  		esdhc_clrbits32(&regs->sysctl, SYSCTL_CKEN);
  #endif
  	} else {
  #ifdef CONFIG_FSL_USDHC
-		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+		esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+				VENDORSPEC_CKEN);
  #else
  		esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
  #endif
@@ -1067,7 +1053,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
  #ifndef CONFIG_FSL_USDHC
  	esdhc_setbits32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
  #else
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_HCKEN | VENDORSPEC_IPGEN);
  #endif
 
  	/* Set the initial clock speed */
@@ -1205,7 +1191,8 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
  	esdhc_write32(&regs->autoc12err, 0);
  	esdhc_write32(&regs->clktunectrlstatus, 0);
  #else
-	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_FRC_SDCLK_ON);
+	esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN |
+			VENDORSPEC_HCKEN | VENDORSPEC_IPGEN | VENDORSPEC_CKEN);
  #endif
 
  	if (priv->vs18_enable)
include/fsl_esdhc_imx.h +0 -2
index b0920344641c..45ed635a77bf 100644
@@ -39,7 +39,6 @@
  #define VENDORSPEC_HCKEN	0x00001000
  #define VENDORSPEC_IPGEN	0x00000800
  #define VENDORSPEC_INIT		0x20007809
-#define VENDORSPEC_FRC_SDCLK_ON 0x00000100
 
  #define IRQSTAT			0x0002e030
  #define IRQSTAT_DMAE		(0x10000000)
@@ -97,7 +96,6 @@
  #define PRSSTAT_CINS		(0x00010000)
  #define PRSSTAT_BREN		(0x00000800)
  #define PRSSTAT_BWEN		(0x00000400)
-#define PRSSTAT_SDOFF		(0x00000080)
  #define PRSSTAT_SDSTB		(0X00000008)
  #define PRSSTAT_DLA		(0x00000004)
  #define PRSSTAT_CICHB		(0x00000002)