Skip to contentSkip to conversation

esdhc: memset mmc struct before putting into use

PATCH New Haijun Zhang 5 participants 7 messages Oct 25, 2013 – Oct 30, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 esdhc: memset mmc struct before putting into use

struct mmc should be clear to all '0' after malloc to avoid unexpect variable value.

Like mmc->has_init = xxx.
In this case mmcinfo will believe the card had been initialized before and skip the initialization.

Test on P5040 and T4240,
Error Log:

=> mmcinfo
Device: FSL_SDHC
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 0-bit
=>

---
 drivers/mmc/fsl_esdhc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mmc/fsl_esdhc.c +1 -0
index a7170b4..d4c1eef 100644
@@ -521,6 +521,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
 	if (!mmc)
 		return -ENOMEM;
 
+	memset(mmc, 0, sizeof(struct mmc));
 	sprintf(mmc->name, "FSL_SDHC");
 	regs = (struct fsl_esdhc *)cfg->esdhc_base;
 
Signature · 1 line
1.8.4
#1 lore raw

PATCH 2/2 powerpc/esdhc: hack t4240 host capabilities register for VS33 bit

T4240 eSDHC host capabilities reigster should have VS33 bit define. hack the code to add the 3.3 voltage support

---
 arch/powerpc/include/asm/config_mpc85xx.h | 1 +
 drivers/mmc/fsl_esdhc.c                   | 6 ++++++
 2 files changed, 7 insertions(+)
arch/powerpc/include/asm/config_mpc85xx.h +1 -0
index 946ea97..84e79c8 100644
@@ -596,6 +596,7 @@
 #define CONFIG_SYS_FSL_SRIO_LIODN
 #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
 #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_SYS_FSL_ERRATUM_A004468
 #define CONFIG_SYS_FSL_ERRATUM_A_004934
 #define CONFIG_SYS_FSL_ERRATUM_A005871
drivers/mmc/fsl_esdhc.c +6 -0
index d4c1eef..b8b2907 100644
@@ -545,6 +545,12 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
 	caps = caps & ~(ESDHC_HOSTCAPBLT_SRS |
 			ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30);
 #endif
+
+/* T4240 host controller capabilities register should have VS33 bit */
+#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
+	caps = caps | ESDHC_HOSTCAPBLT_VS33;
+#endif
+
 	if (caps & ESDHC_HOSTCAPBLT_VS18)
 		voltage_caps |= MMC_VDD_165_195;
 	if (caps & ESDHC_HOSTCAPBLT_VS30)
Signature · 1 line
1.8.4
#2 lore raw

PATCH 2/2 powerpc/esdhc: hack t4240 host capabilities register for VS33 bit

Quoted 2 lines · Haijun Zhang

T4240 eSDHC host capabilities reigster should have VS33 bit define. hack the code to add the 3.3 voltage support

Shall we call it quirk rather than hack? Native English speakers, please chime in.

York

#3 lore raw

PATCH 2/2 powerpc/esdhc: hack t4240 host capabilities register for VS33 bit

In reply to Haijun Zhang
Quoted 27 lines · Haijun Zhang

T4240 eSDHC host capabilities reigster should have VS33 bit define. hack the code to add the 3.3 voltage support

---
 arch/powerpc/include/asm/config_mpc85xx.h | 1 +
 drivers/mmc/fsl_esdhc.c                   | 6 ++++++
 2 files changed, 7 insertions(+)
arch/powerpc/include/asm/config_mpc85xx.h +1 -0
index 946ea97..84e79c8 100644
@@ -596,6 +596,7 @@
 #define CONFIG_SYS_FSL_SRIO_LIODN
 #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
 #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #define CONFIG_SYS_FSL_ERRATUM_A004468
 #define CONFIG_SYS_FSL_ERRATUM_A_004934
 #define CONFIG_SYS_FSL_ERRATUM_A005871
drivers/mmc/fsl_esdhc.c +0 -0
index d4c1eef..b8b2907 100644

drivers/mmc/fsl_esdhc.c int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) · line 552

Quoted 8 lines
drivers/mmc/fsl_esdhc.c +5 -0
@@ -545,6 +545,12 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
 	caps = caps & ~(ESDHC_HOSTCAPBLT_SRS |
 			ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30);
 #endif
+
+/* T4240 host controller capabilities register should have VS33 bit */
+#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
+	caps = caps | ESDHC_HOSTCAPBLT_VS33;
+#endif

Is there an erratum associated with this? Is this that t4240qds-specific bug, or a different bug that affects all t4240?

-Scott

#4 lore raw

PATCH 2/2 powerpc/esdhc: hack t4240 host capabilities register for VS33 bit

? 2013/10/30 2:34, Scott Wood ??:

Quoted 30 lines · Haijun Zhang
Quoted 29 lines

T4240 eSDHC host capabilities reigster should have VS33 bit define. hack the code to add the 3.3 voltage support

---
  arch/powerpc/include/asm/config_mpc85xx.h | 1 +
  drivers/mmc/fsl_esdhc.c                   | 6 ++++++
  2 files changed, 7 insertions(+)
arch/powerpc/include/asm/config_mpc85xx.h +1 -0
index 946ea97..84e79c8 100644
@@ -596,6 +596,7 @@
  #define CONFIG_SYS_FSL_SRIO_LIODN
  #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
  #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
  #define CONFIG_SYS_FSL_ERRATUM_A004468
  #define CONFIG_SYS_FSL_ERRATUM_A_004934
  #define CONFIG_SYS_FSL_ERRATUM_A005871
drivers/mmc/fsl_esdhc.c +0 -0
index d4c1eef..b8b2907 100644
@@ -545,6 +545,12 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
  	caps = caps & ~(ESDHC_HOSTCAPBLT_SRS |
  			ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30);
Quoted 8 lines

drivers/mmc/fsl_esdhc.c int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) · line 552

Quoted 6 lines
drivers/mmc/fsl_esdhc.c +5 -0
  #endif
+
+/* T4240 host controller capabilities register should have VS33 bit */
+#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
+	caps = caps | ESDHC_HOSTCAPBLT_VS33;
+#endif

Is there an erratum associated with this? Is this that t4240qds-specific bug, or a different bug that affects all t4240?

No such relevant errata. I think this capacity missing is also exist on other T4240 board but not be confirmed.
So, I update this patch to make sure the change only affect T4240QDS.

Quoted 3 lines

-Scott

Signature · 2 lines
Thanks & Regards
Haijun.
#5 lore raw

PATCH 1/2 esdhc: memset mmc struct before putting into use

In reply to Haijun Zhang

Haijun Zhang <[email protected]> wrote on 10/24/2013 08:54:42 PM:

Quoted 22 lines

struct mmc should be clear to all '0' after malloc to avoid unexpect variable value.

Like mmc->has_init = xxx.
In this case mmcinfo will believe the card had been initialized before and skip the initialization.

Test on P5040 and T4240,
Error Log:

=> mmcinfo
Device: FSL_SDHC
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 0-bit
=>

Quoted 2 lines

Verified that this patch fixes issues related to booting from eSDHC interface on the P2041RDB with U-Boot 2013.10.

drivers/mmc/fsl_esdhc.c int fsl_esdhc_initialize(bd_t *bis, struct

Quoted 9 lines
---
 drivers/mmc/fsl_esdhc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mmc/fsl_esdhc.c +0 -0
index a7170b4..d4c1eef 100644
@@ -521,6 +521,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct 

fsl_esdhc_cfg *cfg)

Quoted 15 lines
drivers/mmc/fsl_esdhc.c +1 -0
    if (!mmc)
       return -ENOMEM;
 
+   memset(mmc, 0, sizeof(struct mmc));
    sprintf(mmc->name, "FSL_SDHC");
    regs = (struct fsl_esdhc *)cfg->esdhc_base;
 
Signature · 7 lines
1.8.4


_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
#6 lore raw

PATCH 1/2 esdhc: memset mmc struct before putting into use

Thanks. Barnett

:-)
? 2013/10/26 0:28, Ryan Barnett ??:

Quoted 57 lines

Haijun Zhang <[email protected]> wrote on 10/24/2013 08:54:42 PM:

Quoted 22 lines

struct mmc should be clear to all '0' after malloc to avoid unexpect variable value.

Like mmc->has_init = xxx.
In this case mmcinfo will believe the card had been initialized before and skip the initialization.

Test on P5040 and T4240,
Error Log:

=> mmcinfo
Device: FSL_SDHC
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 0-bit
=>

Quoted 2 lines

Verified that this patch fixes issues related to booting from eSDHC interface on the P2041RDB with U-Boot 2013.10.

drivers/mmc/fsl_esdhc.c int fsl_esdhc_initialize(bd_t *bis, struct

Quoted 9 lines
---
  drivers/mmc/fsl_esdhc.c | 1 +
  1 file changed, 1 insertion(+)
drivers/mmc/fsl_esdhc.c +0 -0
index a7170b4..d4c1eef 100644
@@ -521,6 +521,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct

fsl_esdhc_cfg *cfg)

Quoted 15 lines
drivers/mmc/fsl_esdhc.c +1 -0
     if (!mmc)
        return -ENOMEM;
 
+   memset(mmc, 0, sizeof(struct mmc));
     sprintf(mmc->name, "FSL_SDHC");
     regs = (struct fsl_esdhc *)cfg->esdhc_base;
 
Signature · 7 lines
1.8.4


_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
Thanks & Regards
Haijun.