d_init is 0 and ecc_en is 0

jad13041 · Jan 16, 2020 · 234308d · 234308d
1 parent 0f9bf0e
commit 234308d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
@@ -760,7 +760,7 @@ static void set_ddr_sdram_cfg(fsl_ddr_cfg_regs_t *ddr,
 {
 	unsigned int mem_en;		/* DDR SDRAM interface logic enable */
 	unsigned int sren;		/* Self refresh enable (during sleep) */
-	unsigned int ecc_en;		/* ECC enable. */
+	unsigned int ecc_en = 0;		/* ECC enable. */
 	unsigned int rd_en;		/* Registered DIMM enable */
 	unsigned int sdram_type;	/* Type of SDRAM */
 	unsigned int dyn_pwr;		/* Dynamic power management mode */
@@ -781,9 +781,9 @@ static void set_ddr_sdram_cfg(fsl_ddr_cfg_regs_t *ddr,
 	sren = popts->self_refresh_in_sleep;
 	if (common_dimm->all_dimms_ecc_capable) {
 		/* Allow setting of ECC only if all DIMMs are ECC. */
-		ecc_en = popts->ecc_mode;
+		//ecc_en = popts->ecc_mode;
 	} else {
-		ecc_en = 0;
+		//ecc_en = 0;
 	}
 
 	if (common_dimm->all_dimms_registered &&
@@ -818,7 +818,7 @@ static void set_ddr_sdram_cfg(fsl_ddr_cfg_regs_t *ddr,
 	hse = popts->half_strength_driver_enable;
 
 	/* set when ddr bus width < 64 */
-	acc_ecc_en = (dbw != 0 && ecc_en == 1) ? 1 : 0;
+	//acc_ecc_en = (dbw != 0 && ecc_en == 1) ? 1 : 0;
 
 	ddr->ddr_sdram_cfg = (0
 			| ((mem_en & 0x1) << 31)
@@ -857,7 +857,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
 	unsigned int x4_en = 0;		/* x4 DRAM enable */
 	unsigned int obc_cfg;		/* On-The-Fly Burst Chop Cfg */
 	unsigned int ap_en;		/* Address Parity Enable */
-	unsigned int d_init;		/* DRAM data initialization */
+	unsigned int d_init = 0;		/* DRAM data initialization */
 	unsigned int rcw_en = 0;	/* Register Control Word Enable */
 	unsigned int md_en = 0;		/* Mirrored DIMM Enable */
 	unsigned int qd_en = 0;		/* quad-rank DIMM Enable */
@@ -910,18 +910,17 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
 
 #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 	/* Use the DDR controller to auto initialize memory. */
-	d_init = popts->ecc_init_using_memctl;
+	//d_init = popts->ecc_init_using_memctl;
 	ddr->ddr_data_init = 0x22221111;//CONFIG_MEM_INIT_VALUE;
 	debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init);
 #else
 	/* Memory will be initialized via DMA, or not at all. */
-	d_init = 0;
+	//d_init = 0;
 #endif
 
 #if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4)
 	md_en = popts->mirrored_dimm;
 #endif
-	d_init = 0;
 	qd_en = popts->quad_rank_present ? 1 : 0;
 	ddr->ddr_sdram_cfg_2 = (0
 		| ((frc_sr & 0x1) << 31)

diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
@@ -122,8 +122,7 @@ typedef struct ddr4_spd_eeprom_s generic_spd_eeprom_t;
 #define SDRAM_CFG_BI			0x00000001
 
 #define SDRAM_CFG2_FRC_SR		0x80000000
-//#define SDRAM_CFG2_D_INIT		0x00000010
-#define SDRAM_CFG2_D_INIT		0x00000000
+#define SDRAM_CFG2_D_INIT		0x00000010
 #define SDRAM_CFG2_AP_EN		0x00000020
 #define SDRAM_CFG2_ODT_CFG_MASK		0x00600000
 #define SDRAM_CFG2_ODT_NEVER		0