[PATCH] mmc: fsl_esdhc: Fix 'Internal clock never stabilised.' error

Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org --- drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk; + u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min; @@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
+ /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */ + hostver = esdhc_read32(&priv->esdhc_regs->hostver); + if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) { + udelay(10000); + esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); + return; + } + time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) { @@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out; + u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
+ /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */ + hostver = esdhc_read32(&priv->esdhc_regs->hostver); + if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) { + udelay(10000); + return; + } + time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {

On 4/30/22 03:27, Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Just add minor question.
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
Is there any reason to use 10000?
Best Regards, Jaehoon Chung
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {

On Friday 06 May 2022 18:32:18 Jaehoon Chung wrote:
On 4/30/22 03:27, Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Just add minor question.
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
Is there any reason to use 10000?
Hello! I really do not know. This value was there before commit 6f883e501b65. This is probably question for Freescale/NXP people.
Best Regards, Jaehoon Chung
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {

+Haibo
On 2022/4/30 2:27, Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {

+Yangbo
-----Original Message----- From: Peng Fan (OSS) peng.fan@oss.nxp.com Sent: 2022年5月9日 13:37 To: Pali Rohár pali@kernel.org; Peng Fan peng.fan@nxp.com; Priyanka Jain priyanka.jain@nxp.com; Jaehoon Chung jh80.chung@samsung.com; Sinan Akman sinan@writeme.com; Bough Chen haibo.chen@nxp.com Cc: u-boot@lists.denx.de Subject: Re: [PATCH] mmc: fsl_esdhc: Fix 'Internal clock never stabilised.' error
+Haibo
On 2022/4/30 2:27, Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65
("mmc:
fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct
mmc *mmc, uint clock)
u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) { @@ -562,6 +571,7
@@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {

PING?
On Friday 29 April 2022 20:27:34 Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
-- 2.20.1

Hi,
On 6/12/22 18:12, Pali Rohár wrote:
PING?
Sorry for too late.
On Friday 29 April 2022 20:27:34 Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
-- 2.20.1

On Tuesday 14 June 2022 11:25:18 Jaehoon Chung wrote:
Hi,
On 6/12/22 18:12, Pali Rohár wrote:
PING?
Sorry for too late.
When will be this fix patch processed and merged?
On Friday 29 April 2022 20:27:34 Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
-- 2.20.1

PING?
On Thursday 23 June 2022 18:11:37 Pali Rohár wrote:
On Tuesday 14 June 2022 11:25:18 Jaehoon Chung wrote:
Hi,
On 6/12/22 18:12, Pali Rohár wrote:
PING?
Sorry for too late.
When will be this fix patch processed and merged?
On Friday 29 April 2022 20:27:34 Pali Rohár wrote:
Only newer eSDHC controllers set PRSSTAT_SDSTB flag. So do not wait until flag PRSSTAT_SDSTB is set on old pre-2.2 controllers. Instead sleep for fixed amount of time like it was before commit 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support").
This change fixes error 'Internal clock never stabilised.' which is printed on P2020 board at every access to SD card.
Fixes: 6f883e501b65 ("mmc: fsl_esdhc: Add emmc hs200 support") Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
drivers/mmc/fsl_esdhc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index fdf2cc290e06..3b3587bd8d72 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -503,6 +503,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) u32 time_out; u32 value; uint clk;
u32 hostver;
if (clock < mmc->cfg->f_min) clock = mmc->cfg->f_min;
@@ -543,6 +544,14 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
@@ -562,6 +571,7 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable) struct fsl_esdhc *regs = priv->esdhc_regs; u32 value; u32 time_out;
u32 hostver;
value = esdhc_read32(®s->sysctl);
@@ -572,6 +582,13 @@ static void esdhc_clock_control(struct fsl_esdhc_priv *priv, bool enable)
esdhc_write32(®s->sysctl, value);
- /* Only newer eSDHC controllers set PRSSTAT_SDSTB flag */
- hostver = esdhc_read32(&priv->esdhc_regs->hostver);
- if (HOSTVER_VENDOR(hostver) <= VENDOR_V_22) {
udelay(10000);
return;
- }
- time_out = 20; value = PRSSTAT_SDSTB; while (!(esdhc_read32(®s->prsstat) & value)) {
-- 2.20.1
participants (4)
-
Bough Chen
-
Jaehoon Chung
-
Pali Rohár
-
Peng Fan (OSS)