Skip to contentSkip to conversation

esdhc: memset mmc struct before putting into use

PATCH New Haijun Zhang 3 participants 5 messages Oct 31, 2013 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH v3 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
=>

---
changes for V3:
- Only add Tested-by no other changes
changes for V2:
- No changes

 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 v3 2/2 powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register

T4240QDS eSDHC host capabilities reigster should have VS33 bit define. Add quirk CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 to deal with capacity missing

---
changes for V3:
- Move the macro define to T4240QDS.h

 drivers/mmc/fsl_esdhc.c    | 6 ++++++
 include/configs/T4240QDS.h | 1 +
 2 files changed, 7 insertions(+)
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)
include/configs/T4240QDS.h +1 -0
index 590799c..3777ccb 100644
@@ -463,6 +463,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
 #define CONFIG_BOOTDELAY	10	/* -1 disables auto-boot */
Signature · 1 line
1.8.4
#2 lore raw

PATCH v3 2/2 powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register

Hi Haijun,

Quoted 47 lines · Haijun Zhang

T4240QDS eSDHC host capabilities reigster should have VS33 bit define. Add quirk CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 to deal with capacity missing

---
changes for V3:
- Move the macro define to T4240QDS.h

drivers/mmc/fsl_esdhc.c | 6 ++++++
include/configs/T4240QDS.h | 1 +

2 files changed, 7 insertions(+)
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)
include/configs/T4240QDS.h +1 -0
index 590799c..3777ccb 100644
@@ -463,6 +463,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
 #define CONFIG_BOOTDELAY	10	/* -1 disables auto-boot */
Signature · 1 line
1.8.4

Applied, thanks.

#3 lore raw

PATCH v3 2/2 powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register

Thanks a lot.

? 2013/10/31 15:53, Pantelis Antoniou ??:

Quoted 56 lines

Hi Haijun,

Quoted 47 lines · Haijun Zhang

T4240QDS eSDHC host capabilities reigster should have VS33 bit define. Add quirk CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 to deal with capacity missing

---
changes for V3:
- Move the macro define to T4240QDS.h

drivers/mmc/fsl_esdhc.c | 6 ++++++
include/configs/T4240QDS.h | 1 +

2 files changed, 7 insertions(+)
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)
include/configs/T4240QDS.h +1 -0
index 590799c..3777ccb 100644
@@ -463,6 +463,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
+#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
 #define CONFIG_BOOTDELAY	10	/* -1 disables auto-boot */
Signature · 1 line
1.8.4

Applied, thanks.

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

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

In reply to Haijun Zhang

Hi Haijun,

Quoted 50 lines · Haijun Zhang

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
=>

---
changes for V3:
- Only add Tested-by no other changes
changes for V2:
- No changes

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

Applied, thanks.