mmc: fsl: reset to normal boot mode when eMMC fast boot
PATCH 1/3 mmc: fsl: reset to normal boot mode when eMMC fast boot
When booting in eMMC fast boot, MMC host does not exit from boot mode after bootrom loading image. So the first command 'CMD0' sent in uboot will pull down the CMD line to low and cause errors.
This patch cleans the MMC boot register in "mmc_init" to put the MMC host back to normal mode.
Also clear DLL_CTRL delay line settings at USDHC initialization to eliminate the pre-settings from boot rom.
--- drivers/mmc/fsl_esdhc.c | 38 +++++++++++++++++++++++++++++--------- include/fsl_esdhc.h | 6 ++++++ 2 files changed, 35 insertions(+), 9 deletions(-)
drivers/mmc/fsl_esdhc.c +29 -9
@@ -57,21 +57,27 @@ struct fsl_esdhc {uint fevt;/* Force event register */ uint admaes;/* ADMA error status register */ uint adsaddr;/* ADMA system address register */ -char reserved2[100 ];/* reserved */ -uint vendorspec;/* Vendor Specific register */ -char reserved3[56 ];/* reserved */ +char reserved2[4 ]; +uint dllctrl; +uint dllstat; +uint clktunectrlstatus; +char reserved3[84 ]; +uint vendorspec; +uint mmcboot; +uint vendorspec2; +char reserved4[48 ];uint hostver;/* Host controller version register */ -char reserved4[4 ];/* reserved */ -uint dmaerraddr;/* DMA error address register */ char reserved5[4 ];/* reserved */ -uint dmaerrattr;/* DMA error attribute register */ +uint dmaerraddr;/* DMA error address register */ char reserved6[4 ];/* reserved */ +uint dmaerrattr;/* DMA error attribute register */ +char reserved7[4 ];/* reserved */ uint hostcapblt2;/* Host controller capabilities register 2 */ -char reserved7[8 ];/* reserved */ +char reserved8[8 ];/* reserved */ uint tcr;/* Tuning control register */ -char reserved8[28 ];/* reserved */ +char reserved9[28 ];/* reserved */ uint sddirctl;/* SD direction control register */ -char reserved9[712 ];/* reserved */ +char reserved10[712 ];/* reserved */ uint scr;/* eSDHC control register */ };
@@ -618,6 +624,20 @@ static int esdhc_init(struct mmc *mmc)while ((esdhc_read32 (®s->sysctl) &SYSCTL_RSTA ) && --timeout)udelay (1000 ); +#if defined(CONFIG_FSL_USDHC ) +/* RSTA doesn't reset MMC_BOOT register, so manually reset it */ +esdhc_write32 (®s->mmcboot,0x0 ); +/* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ +esdhc_write32 (®s->mixctrl,0x0 ); +esdhc_write32 (®s->clktunectrlstatus,0x0 ); + +/* Put VEND_SPEC to default value */ +esdhc_write32 (®s->vendorspec,VENDORSPEC_INIT ); + +/* Disable DLL_CTRL delay line */ +esdhc_write32 (®s->dllctrl,0x0 ); +#endif +#ifndef ARCH_MXC /* Enable cache snooping */ esdhc_write32 (®s->scr,0x00000040 );
include/fsl_esdhc.h +6 -0
@@ -35,6 +35,12 @@#define SYSCTL_RSTC 0x02000000#define SYSCTL_RSTD 0x04000000 +#define VENDORSPEC_CKEN 0x00004000 +#define VENDORSPEC_PEREN 0x00002000 +#define VENDORSPEC_HCKEN 0x00001000 +#define VENDORSPEC_IPGEN 0x00000800 +#define VENDORSPEC_INIT 0x20007809 +#define IRQSTAT 0x0002e030#define IRQSTAT_DMAE (0x10000000)#define IRQSTAT_AC12E (0x01000000)
Signature · 1 line
2.6.2
PATCH 2/3 fsl_esdhc: Update clock enable bits for USDHC
From: Ye Li <[email protected]>
The USDHC move the 4 clock bits CARD_CLK_SOFT_EN, IPG_PERCLK_SOFT_EN, HCLK_SOFT_EN, and IPG_CLK_SOFT_EN from sysctl register to vendorspec register. The driver uses RSTA to replace the clock gate off operation. But this is not a good solution. This is because:
1. when using RSTA, we should wait this bit to clear by itself. This is not implemeneted in the code.
2. After RSTA is set, it is recommended that the Host Driver reset the external card and reinitialize it.
So in this patch, we change to use the vendorspec registers for these bits operation.
--- drivers/mmc/fsl_esdhc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/mmc/fsl_esdhc.c +7 -2
@@ -540,7 +540,7 @@ static void set_sysctl(struct mmc *mmc, uint clock) clk = (pre_div <<8 ) | (div <<4 );#ifdef CONFIG_FSL_USDHC -esdhc_setbits32 (®s->sysctl,SYSCTL_RSTA ); +esdhc_clrbits32 (®s->vendorspec,VENDORSPEC_CKEN );#else esdhc_clrbits32 (®s->sysctl,SYSCTL_CKEN );#endif
@@ -550,7 +550,7 @@ static void set_sysctl(struct mmc *mmc, uint clock)udelay (10000 );#ifdef CONFIG_FSL_USDHC -esdhc_clrbits32 (®s->sysctl,SYSCTL_RSTA ); +esdhc_setbits32 (®s->vendorspec,VENDORSPEC_PEREN |VENDORSPEC_CKEN );#else esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_CKEN );#endif
@@ -645,6 +645,8 @@ static int esdhc_init(struct mmc *mmc)#ifndef CONFIG_FSL_USDHC esdhc_setbits32 (®s->sysctl,SYSCTL_HCKEN |SYSCTL_IPGEN ); +#else +esdhc_setbits32 (®s->vendorspec,VENDORSPEC_HCKEN |VENDORSPEC_IPGEN );#endif /* Set the initial clock speed */
@@ -766,6 +768,9 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv)#ifndef CONFIG_FSL_USDHC esdhc_setbits32 (®s->sysctl,SYSCTL_PEREN |SYSCTL_HCKEN |SYSCTL_IPGEN |SYSCTL_CKEN ); +#else +esdhc_setbits32 (®s->vendorspec,VENDORSPEC_PEREN | +VENDORSPEC_HCKEN |VENDORSPEC_IPGEN |VENDORSPEC_CKEN );#endif writel (SDHCI_IRQ_EN_BITS , ®s->irqstaten);
Signature · 1 line
2.6.2
PATCH 3/3 mmc: fsl: introduce wp_enable
In reply to Peng FanIntroudce wp_enable. If want to check WPSPL, then in board code, need to set wp_enable to 1.
Take i.MX6UL for example, to some boards, they do not use WP singal, so they does not configure USDHC1_WP_SELECT_INPUT, and its default value is 0(GPIO1_IO02). However GPIO1_IO02 is muxed for i2c usage and SION bit set. So USDHC controller can always get wp signal and WPSPL shows write protect and blocks driver continuing. This is not what we want to see, so add wp_enable, and if set to 0, just omit the WPSPL checking and this does not effect normal working of usdhc controller.
To DT case, add wp_gpio, if there is wp-gpios provided in dts, wp_enable is set to 1; if no, set to 0.
--- drivers/mmc/fsl_esdhc.c | 21 ++++++++++++++++++--- include/fsl_esdhc.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/mmc/fsl_esdhc.c +18 -3
@@ -92,7 +92,9 @@ struct fsl_esdhc {* Following is used when Driver Model is enabled for MMC * @dev: pointer for the device * @non_removable: 0: removable; 1: non-removable +* @wp_enable: 1: enable checking wp; 0: no check * @cd_gpio: gpio for card detection +* @wp_gpio: gpio for write protection */ struct fsl_esdhc_priv {struct fsl_esdhc *esdhc_regs;
@@ -102,7 +104,9 @@ struct fsl_esdhc_priv {struct mmc *mmc;struct udevice *dev;int non_removable; +int wp_enable;struct gpio_desc cd_gpio; +struct gpio_desc wp_gpio; };/* Return the XFERTYP flags for a given command and data packet */
@@ -246,9 +250,12 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)#endif if (wml_value >WML_WR_WML_MAX ) wml_value =WML_WR_WML_MAX_VAL ; -if ((esdhc_read32 (®s->prsstat) &PRSSTAT_WPSPL ) ==0 ) { -printf ("\nThe SD card is locked. Can not write to a locked card.\n\n" ); -return TIMEOUT ; +if (priv->wp_enable) { +if ((esdhc_read32 (®s->prsstat) & +PRSSTAT_WPSPL ) ==0 ) { +printf ("\nThe SD card is locked. Can not write to a locked card.\n\n" ); +return TIMEOUT ; + } } esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK,
@@ -747,6 +754,7 @@ static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long )(cfg->esdhc_base); priv->bus_width = cfg->max_bus_width; priv->sdhc_clk = cfg->sdhc_clk; + priv->wp_enable = cfg->wp_enable;return 0 ; };
@@ -989,6 +997,13 @@ static int fsl_esdhc_probe(struct udevice *dev) &priv->cd_gpio, GPIOD_IS_IN); } + priv->wp_enable =1 ; + + ret =gpio_request_by_name_nodev (fdt, node,"wp-gpios" ,0 , + &priv->wp_gpio,GPIOD_IS_IN ); +if (ret) + priv->wp_enable =0 ; +/* * TODO: * Because lack of clk driver, if SDHC clk is not enabled,
include/fsl_esdhc.h +1 -0
@@ -177,6 +177,7 @@ struct fsl_esdhc_cfg {phys_addr_t esdhc_base;u32 sdhc_clk;u8 max_bus_width; +u8 wp_enable;struct mmc_config cfg; };
Signature · 1 line
2.6.2
PATCH 3/3 mmc: fsl: introduce wp_enable
Hi Peng,
Quoted 12 lines · Peng Fan
Introudce
wp_enable. If want to check WPSPL, then in board code, need to setwp_enableto 1.Take i.MX6UL for example, to some boards, they do not use WP singal, so they does not configure
USDHC1_WP_SELECT_INPUT, and its default value is 0(GPIO1_IO02). HoweverGPIO1_IO02is muxed for i2c usage and SION bit set. So USDHC controller can always get wp signal and WPSPL shows write protect and blocks driver continuing. This is not what we want to see, so addwp_enable, and if set to 0, just omit the WPSPL checking and this does not effect normal working of usdhc controller.
Quoted 7 lines
To DT case, add
wp_gpio, if there is wp-gpios provided in dts,wp_enableis set to 1; if no, set to 0.Signed-off-by Peng Fan <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc York Sun <[email protected]>Cc Stefano Babic <[email protected]>
Just saw this issue on a mx6ul pico board: after adding I2C support then the eMMC could not longer be written:
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)...
The SD card is locked. Can not write to a locked card.
mmc write failed
failed
Your patch allows me to write to the eMMC succesfully:
PATCH 3/3 mmc: fsl: introduce wp_enable
Hi Peng,
Quoted 8 lines · Fabio Estevam
Just saw this issue on a mx6ul pico board: after adding I2C support then the eMMC could not longer be written:
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)...
The SD card is locked. Can not write to a locked card.
Quoted 6 lines
mmc write failed
failedYour patch allows me to write to the eMMC succesfully:
Tested-by Fabio Estevam <[email protected]>
Looks like this is an issue with the MX6UL IOMUXC, not the esdhc driver itself, so maybe we should not do this change for all other SoCs.
If I manually do:
=> mw.l 20E066C 2
Then 'saveenv' works fine.
Shouldn't we fix this in the MX6UL IOMUXC code instead?
PATCH 3/3 mmc: fsl: introduce wp_enable
Hi Fabio,
Quoted 18 lines · Fabio Estevam
Hi Peng,
Quoted 14 lines · Fabio Estevam
Just saw this issue on a mx6ul pico board: after adding I2C support then the eMMC could not longer be written:
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)...
The SD card is locked. Can not write to a locked card.mmc write failed
failedYour patch allows me to write to the eMMC succesfully:
Tested-by Fabio Estevam <[email protected]>
Thanks. This patch set was posted some time ago.
Quoted 10 lines
Looks like this is an issue with the MX6UL IOMUXC, not the esdhc driver itself, so maybe we should not do this change for all other SoCs.
If I manually do:
=> mw.l 20E066C 2
Then 'saveenv' works fine.Shouldn't we fix this in the MX6UL IOMUXC code instead?
No. We can not avoid such issue for now. You changed register 20e066c'value to 2 2 means "CSI_DATA04_ALT8 ? Selecting Pad: CSI_DATA04 for Mode: ALT8"
Look at "Figure 31-3. Daisy chain illustration" of i.MX6UL RM, if changed to 2, that means you let CSI_DATA04 pad goes into usdhc1_wp.
select input can not be closed or disabled, which will cause issues like what you met. Even worse, some one may need to redesign their board to avoid pin conflict.
Regards,
Peng.
PATCH 3/3 mmc: fsl: introduce wp_enable
Hi Peng,
Quoted 5 lines · Peng Fan
No. We can not avoid such issue for now. You changed register 20e066c'value to 2 2 means "
CSI_DATA04_ALT8? Selecting Pad:CSI_DATA04for Mode: ALT8"Look at "Figure 31-3. Daisy chain illustration" of i.MX6UL RM, if changed to 2, that means you let
CSI_DATA04pad goes intousdhc1_wp.
Yes, this was just a quick hack. I am not proposing this workaround :-)
Quoted 3 lines
select input can not be closed or disabled, which will cause issues like what you met. Even worse, some one may need to redesign their board to avoid pin conflict.
Yes, I understood the problem and don't have any alternative suggestion at the moment.
Pantelis/Stefano/Tom/York,
Any feedback on this series, please?
PATCH 3/3 mmc: fsl: introduce wp_enable
Quoted 16 lines · Fabio Estevam
Hi Peng,
Quoted 5 lines · Peng Fan
No. We can not avoid such issue for now. You changed register 20e066c'value to 2 2 means "
CSI_DATA04_ALT8? Selecting Pad:CSI_DATA04for Mode: ALT8"Look at "Figure 31-3. Daisy chain illustration" of i.MX6UL RM, if changed to 2, that means you let
CSI_DATA04pad goes intousdhc1_wp.Yes, this was just a quick hack. I am not proposing this workaround :-)
Quoted 3 lines
select input can not be closed or disabled, which will cause issues like what you met. Even worse, some one may need to redesign their board to avoid pin conflict.
Quoted 7 lines
Yes, I understood the problem and don't have any alternative suggestion at the moment.
Pantelis/Stefano/Tom/York,
Any feedback on this series, please?
It looks good to me, but I didn't test it.
York
PATCH 3/3 mmc: fsl: introduce wp_enable
In reply to Peng FanQuoted 5 lines · Peng Fan
Quoted 3 lines
Quoted 3 lines
Your patch allows me to write to the eMMC succesfully:
Tested-by Fabio Estevam <[email protected]>Thanks. This patch set was posted some time ago.
Care to resend this series, please?
Thanks
PATCH 3/3 mmc: fsl: introduce wp_enable
Hi Fabio,
Quoted 9 lines · Fabio Estevam
Quoted 5 lines · Peng Fan
Quoted 3 lines
Quoted 3 lines
Your patch allows me to write to the eMMC succesfully:
Tested-by Fabio Estevam <[email protected]>Thanks. This patch set was posted some time ago.
Care to resend this series, please?
Ok. I will resend this series with your tested-by tag.
Thanks,
Peng.
Quoted 2 lines
Thanks
PATCH 1/3 mmc: fsl: reset to normal boot mode when eMMC fast boot
In reply to Peng FanHi Peng,
Quoted 7 lines · Peng Fan
When booting in eMMC fast boot, MMC host does not exit from boot mode after bootrom loading image. So the first command 'CMD0' sent in uboot will pull down the CMD line to low and cause errors.
This patch cleans the MMC boot register in "
mmc_init" to put the MMC host back to normal mode.
Could you resend the patch-set [1/3 - 3/3] on latest u-boot? After that, I will check..
Best Regards,
Jaehoon Chung
Quoted 93 lines
Also clear
DLL_CTRLdelay line settings at USDHC initialization to eliminate the pre-settings from boot rom.Signed-off-by Peng Fan <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc York Sun <[email protected]>Cc Stefano Babic <[email protected]>--- drivers/mmc/fsl_esdhc.c | 38 +++++++++++++++++++++++++++++--------- include/fsl_esdhc.h | 6 ++++++ 2 files changed, 35 insertions(+), 9 deletions(-)drivers/mmc/fsl_esdhc.c +29
-9@@ -57,21 +57,27 @@ struct fsl_esdhc {uint fevt;/* Force event register */ uint admaes;/* ADMA error status register */ uint adsaddr;/* ADMA system address register */ -char reserved2[100 ];/* reserved */ -uint vendorspec;/* Vendor Specific register */ -char reserved3[56 ];/* reserved */ +char reserved2[4 ]; +uint dllctrl; +uint dllstat; +uint clktunectrlstatus; +char reserved3[84 ]; +uint vendorspec; +uint mmcboot; +uint vendorspec2; +char reserved4[48 ];uint hostver;/* Host controller version register */ -char reserved4[4 ];/* reserved */ -uint dmaerraddr;/* DMA error address register */ char reserved5[4 ];/* reserved */ -uint dmaerrattr;/* DMA error attribute register */ +uint dmaerraddr;/* DMA error address register */ char reserved6[4 ];/* reserved */ +uint dmaerrattr;/* DMA error attribute register */ +char reserved7[4 ];/* reserved */ uint hostcapblt2;/* Host controller capabilities register 2 */ -char reserved7[8 ];/* reserved */ +char reserved8[8 ];/* reserved */ uint tcr;/* Tuning control register */ -char reserved8[28 ];/* reserved */ +char reserved9[28 ];/* reserved */ uint sddirctl;/* SD direction control register */ -char reserved9[712 ];/* reserved */ +char reserved10[712 ];/* reserved */ uint scr;/* eSDHC control register */ };@@ -618,6 +624,20 @@ static int esdhc_init(struct mmc *mmc)while ((esdhc_read32 (®s->sysctl) &SYSCTL_RSTA ) && --timeout)udelay (1000 ); +#if defined(CONFIG_FSL_USDHC ) +/* RSTA doesn't reset MMC_BOOT register, so manually reset it */ +esdhc_write32 (®s->mmcboot,0x0 ); +/* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ +esdhc_write32 (®s->mixctrl,0x0 ); +esdhc_write32 (®s->clktunectrlstatus,0x0 ); + +/* Put VEND_SPEC to default value */ +esdhc_write32 (®s->vendorspec,VENDORSPEC_INIT ); + +/* Disable DLL_CTRL delay line */ +esdhc_write32 (®s->dllctrl,0x0 ); +#endif +#ifndef ARCH_MXC /* Enable cache snooping */ esdhc_write32 (®s->scr,0x00000040 );include/fsl_esdhc.h +6
-0@@ -35,6 +35,12 @@#define SYSCTL_RSTC 0x02000000#define SYSCTL_RSTD 0x04000000 +#define VENDORSPEC_CKEN 0x00004000 +#define VENDORSPEC_PEREN 0x00002000 +#define VENDORSPEC_HCKEN 0x00001000 +#define VENDORSPEC_IPGEN 0x00000800 +#define VENDORSPEC_INIT 0x20007809 +#define IRQSTAT 0x0002e030#define IRQSTAT_DMAE (0x10000000)#define IRQSTAT_AC12E (0x01000000)
PATCH 1/3 mmc: fsl: reset to normal boot mode when eMMC fast boot
Hi Jaehoon,
Quoted 8 lines · Jaehoon Chung
Hi Peng,
Quoted 5 lines · Peng Fan
When booting in eMMC fast boot, MMC host does not exit from boot mode after bootrom loading image. So the first command 'CMD0' sent in uboot will pull down the CMD line to low and cause errors.
Quoted 5 lines
Quoted 2 lines
This patch cleans the MMC boot register in "
mmc_init" to put the MMC host back to normal mode.Could you resend the patch-set [1/3 - 3/3] on latest u-boot? After that, I will check..
This patch set already merged through York's tree.
Thanks,
Peng.
Quoted 98 lines
Best Regards,
Jaehoon ChungQuoted 93 lines
Also clear
DLL_CTRLdelay line settings at USDHC initialization to eliminate the pre-settings from boot rom.Signed-off-by Peng Fan <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc York Sun <[email protected]>Cc Stefano Babic <[email protected]>--- drivers/mmc/fsl_esdhc.c | 38 +++++++++++++++++++++++++++++--------- include/fsl_esdhc.h | 6 ++++++ 2 files changed, 35 insertions(+), 9 deletions(-)drivers/mmc/fsl_esdhc.c +29
-9@@ -57,21 +57,27 @@ struct fsl_esdhc {uint fevt;/* Force event register */ uint admaes;/* ADMA error status register */ uint adsaddr;/* ADMA system address register */ -char reserved2[100 ];/* reserved */ -uint vendorspec;/* Vendor Specific register */ -char reserved3[56 ];/* reserved */ +char reserved2[4 ]; +uint dllctrl; +uint dllstat; +uint clktunectrlstatus; +char reserved3[84 ]; +uint vendorspec; +uint mmcboot; +uint vendorspec2; +char reserved4[48 ];uint hostver;/* Host controller version register */ -char reserved4[4 ];/* reserved */ -uint dmaerraddr;/* DMA error address register */ char reserved5[4 ];/* reserved */ -uint dmaerrattr;/* DMA error attribute register */ +uint dmaerraddr;/* DMA error address register */ char reserved6[4 ];/* reserved */ +uint dmaerrattr;/* DMA error attribute register */ +char reserved7[4 ];/* reserved */ uint hostcapblt2;/* Host controller capabilities register 2 */ -char reserved7[8 ];/* reserved */ +char reserved8[8 ];/* reserved */ uint tcr;/* Tuning control register */ -char reserved8[28 ];/* reserved */ +char reserved9[28 ];/* reserved */ uint sddirctl;/* SD direction control register */ -char reserved9[712 ];/* reserved */ +char reserved10[712 ];/* reserved */ uint scr;/* eSDHC control register */ };@@ -618,6 +624,20 @@ static int esdhc_init(struct mmc *mmc)while ((esdhc_read32 (®s->sysctl) &SYSCTL_RSTA ) && --timeout)udelay (1000 ); +#if defined(CONFIG_FSL_USDHC ) +/* RSTA doesn't reset MMC_BOOT register, so manually reset it */ +esdhc_write32 (®s->mmcboot,0x0 ); +/* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ +esdhc_write32 (®s->mixctrl,0x0 ); +esdhc_write32 (®s->clktunectrlstatus,0x0 ); + +/* Put VEND_SPEC to default value */ +esdhc_write32 (®s->vendorspec,VENDORSPEC_INIT ); + +/* Disable DLL_CTRL delay line */ +esdhc_write32 (®s->dllctrl,0x0 ); +#endif +#ifndef ARCH_MXC /* Enable cache snooping */ esdhc_write32 (®s->scr,0x00000040 );include/fsl_esdhc.h +6
-0@@ -35,6 +35,12 @@#define SYSCTL_RSTC 0x02000000#define SYSCTL_RSTD 0x04000000 +#define VENDORSPEC_CKEN 0x00004000 +#define VENDORSPEC_PEREN 0x00002000 +#define VENDORSPEC_HCKEN 0x00001000 +#define VENDORSPEC_IPGEN 0x00000800 +#define VENDORSPEC_INIT 0x20007809 +#define IRQSTAT 0x0002e030#define IRQSTAT_DMAE (0x10000000)#define IRQSTAT_AC12E (0x01000000)
PATCH 1/3 mmc: fsl: reset to normal boot mode when eMMC fast boot
Quoted 10 lines · Peng Fan
Hi Jaehoon,
Quoted 8 lines · Jaehoon Chung
Hi Peng,
Quoted 5 lines · Peng Fan
When booting in eMMC fast boot, MMC host does not exit from boot mode after bootrom loading image. So the first command 'CMD0' sent in uboot will pull down the CMD line to low and cause errors.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
This patch cleans the MMC boot register in "
mmc_init" to put the MMC host back to normal mode.Could you resend the patch-set [1/3 - 3/3] on latest u-boot? After that, I will check..
This patch set already merged through York's tree.
Thanks for noticing!
Best Regards,
Jaehoon Chung
Quoted 105 lines
Thanks,
Peng.Quoted 98 lines
Best Regards,
Jaehoon ChungQuoted 93 lines
Also clear
DLL_CTRLdelay line settings at USDHC initialization to eliminate the pre-settings from boot rom.Signed-off-by Peng Fan <[email protected]>Cc Pantelis Antoniou <[email protected]>Cc York Sun <[email protected]>Cc Stefano Babic <[email protected]>--- drivers/mmc/fsl_esdhc.c | 38 +++++++++++++++++++++++++++++--------- include/fsl_esdhc.h | 6 ++++++ 2 files changed, 35 insertions(+), 9 deletions(-)drivers/mmc/fsl_esdhc.c +29
-9@@ -57,21 +57,27 @@ struct fsl_esdhc {uint fevt;/* Force event register */ uint admaes;/* ADMA error status register */ uint adsaddr;/* ADMA system address register */ -char reserved2[100 ];/* reserved */ -uint vendorspec;/* Vendor Specific register */ -char reserved3[56 ];/* reserved */ +char reserved2[4 ]; +uint dllctrl; +uint dllstat; +uint clktunectrlstatus; +char reserved3[84 ]; +uint vendorspec; +uint mmcboot; +uint vendorspec2; +char reserved4[48 ];uint hostver;/* Host controller version register */ -char reserved4[4 ];/* reserved */ -uint dmaerraddr;/* DMA error address register */ char reserved5[4 ];/* reserved */ -uint dmaerrattr;/* DMA error attribute register */ +uint dmaerraddr;/* DMA error address register */ char reserved6[4 ];/* reserved */ +uint dmaerrattr;/* DMA error attribute register */ +char reserved7[4 ];/* reserved */ uint hostcapblt2;/* Host controller capabilities register 2 */ -char reserved7[8 ];/* reserved */ +char reserved8[8 ];/* reserved */ uint tcr;/* Tuning control register */ -char reserved8[28 ];/* reserved */ +char reserved9[28 ];/* reserved */ uint sddirctl;/* SD direction control register */ -char reserved9[712 ];/* reserved */ +char reserved10[712 ];/* reserved */ uint scr;/* eSDHC control register */ };@@ -618,6 +624,20 @@ static int esdhc_init(struct mmc *mmc)while ((esdhc_read32 (®s->sysctl) &SYSCTL_RSTA ) && --timeout)udelay (1000 ); +#if defined(CONFIG_FSL_USDHC ) +/* RSTA doesn't reset MMC_BOOT register, so manually reset it */ +esdhc_write32 (®s->mmcboot,0x0 ); +/* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ +esdhc_write32 (®s->mixctrl,0x0 ); +esdhc_write32 (®s->clktunectrlstatus,0x0 ); + +/* Put VEND_SPEC to default value */ +esdhc_write32 (®s->vendorspec,VENDORSPEC_INIT ); + +/* Disable DLL_CTRL delay line */ +esdhc_write32 (®s->dllctrl,0x0 ); +#endif +#ifndef ARCH_MXC /* Enable cache snooping */ esdhc_write32 (®s->scr,0x00000040 );include/fsl_esdhc.h +6
-0@@ -35,6 +35,12 @@#define SYSCTL_RSTC 0x02000000#define SYSCTL_RSTD 0x04000000 +#define VENDORSPEC_CKEN 0x00004000 +#define VENDORSPEC_PEREN 0x00002000 +#define VENDORSPEC_HCKEN 0x00001000 +#define VENDORSPEC_IPGEN 0x00000800 +#define VENDORSPEC_INIT 0x20007809 +#define IRQSTAT 0x0002e030#define IRQSTAT_DMAE (0x10000000)#define IRQSTAT_AC12E (0x01000000)