mmc: fsl_esdhc: Avoid infinite loop in esdhc_send_cmd_common()
PATCH 1/1 mmc: fsl_esdhc: Avoid infinite loop in esdhc_send_cmd_common()
The following hang is observed on a Hummingboard 2 MicroSOM i2eX iMX6D - rev 1.3 with no eMMC populated on board:
U-Boot SPL 2018.11+gf6206f8587 (Nov 16 2018 - 00:56:34 +0000) Trying to boot from MMC1
U-Boot 2018.11+gf6206f8587 (Nov 16 2018 - 00:56:34 +0000)
CPU: Freescale i.MX6D rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 33C Reset cause: POR Board: MX6 HummingBoard2 DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... *** Warning - bad CRC, using default environment
No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial
---> hangs
which is caused by the following infinite loop inside esdhc_send_cmd_common()
while (!(esdhc_read32(®s->irqstat) & flags)) ;
Instead of looping forever, provide an exit path so that a timeout error can be propagated in the case irqstat does not report any interrupts, which may happen when no eMMC is populated on board.
--- drivers/mmc/fsl_esdhc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/mmc/fsl_esdhc.c +6 -2
@@ -396,6 +396,7 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,uint irqstat;u32 flags =IRQSTAT_CC |IRQSTAT_CTOE ;struct fsl_esdhc *regs = priv->esdhc_regs; +unsigned long start;#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111 if (cmd->cmdidx ==MMC_CMD_STOP_TRANSMISSION )
@@ -453,8 +454,11 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, flags =IRQSTAT_BRR ;/* Wait for the command to complete */ -while (!(esdhc_read32 (®s->irqstat) & flags)) - ; + start =get_timer (0 ); +while (!(esdhc_read32 (®s->irqstat) & flags)) { +if (get_timer (start) >1000 ) +return -ETIMEDOUT ; + } irqstat =esdhc_read32 (®s->irqstat);
Signature · 1 line
2.7.4
PATCH 1/1 mmc: fsl_esdhc: Avoid infinite loop in esdhc_send_cmd_common()
Hi Fabio,
Quoted 52 lines · Fabio Estevam
The following hang is observed on a Hummingboard 2 MicroSOM i2eX iMX6D - rev 1.3 with no eMMC populated on board:
U-Boot SPL 2018.11+gf6206f8587 (Nov 16 2018 - 00:56:34 +0000) Trying to boot from MMC1
U-Boot 2018.11+gf6206f8587 (Nov 16 2018 - 00:56:34 +0000)
CPU: Freescale i.MX6D rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 33C Reset cause: POR Board: MX6 HummingBoard2 DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1Loading Environment from MMC... *** Warning - bad CRC, using default environment
No panel detected: default to HDMI Display: HDMI (1024x768) In: serial Out: serial Err: serial---> hangs
which is caused by the following infinite loop inside
esdhc_send_cmd_common()while (!(esdhc_read32(®s->irqstat) & flags)) ;Instead of looping forever, provide an exit path so that a timeout error can be propagated in the case irqstat does not report any interrupts, which may happen when no eMMC is populated on board.
Reported-by Ricardo Salveti <[email protected]>Signed-off-by Fabio Estevam <[email protected]>--- drivers/mmc/fsl_esdhc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/mmc/fsl_esdhc.c +1
-0@@ -396,6 +396,7 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,uint irqstat;u32 flags =IRQSTAT_CC |IRQSTAT_CTOE ;struct fsl_esdhc *regs = priv->esdhc_regs; +unsigned long start;#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111 if (cmd->cmdidx ==MMC_CMD_STOP_TRANSMISSION )
drivers/mmc/fsl_esdhc.c static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, · line 460
Quoted 9 lines
drivers/mmc/fsl_esdhc.c +4
-2@@ -453,8 +454,11 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, flags =IRQSTAT_BRR ;/* Wait for the command to complete */ -while (!(esdhc_read32 (®s->irqstat) & flags)) - ; + start =get_timer (0 ); +while (!(esdhc_read32 (®s->irqstat) & flags)) { +if (get_timer (start) >1000 ) +return -ETIMEDOUT ;
Most other error paths in this routine do 'goto out' instead. The code under the 'out' label resets the module.
baruch
Quoted 3 lines
drivers/mmc/fsl_esdhc.c +1
-0+ } irqstat =esdhc_read32 (®s->irqstat);
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/1 mmc: fsl_esdhc: Avoid infinite loop in esdhc_send_cmd_common()
Hi Baruch,
Quoted 2 lines · Baruch Siach
Most other error paths in this routine do 'goto out' instead. The code under the 'out' label resets the module.
Thanks for the suggestion. I have sent a v2 that jumps to the 'out' label.
Hopefully it will not hang there as there are more inifinite loops in this path :-)