Skip to contentSkip to conversation

ppc4xx: Fix DDR2 auto calibration on Kilauea 600MHz

PATCH New Victor Gallardo 2 participants 2 messages Sep 16, 2008 – Sep 21, 2008

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ppc4xx: Fix DDR2 auto calibration on Kilauea 600MHz

---
v2:
- Add comments on why this is need for 200MHz PLB bus
- Minor coding style cleanup

 board/amcc/kilauea/kilauea.c        |   31 +++++++++++++++++++++++++++++++
 cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |    5 -----
 include/asm-ppc/ppc4xx-sdram.h      |    6 ++++++
 3 files changed, 37 insertions(+), 5 deletions(-)
board/amcc/kilauea/kilauea.c +31 -0
index 7b10255..fcab9ca 100644
@@ -374,3 +374,34 @@ int post_hotkeys_pressed(void)
 	return 0;	/* No hotkeys supported */
 }
 #endif /* CONFIG_POST */
+
+#if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION)
+/*
+ * This is for quicker auto calibration boot up once WRDTR and CLKTR
+ * values for the kilauea board were determined and are therefore known.
+ *
+ * Use these scan options for PLB bus greater than or equal 200MHz
+ * else use the defaults. These options are known to return a cycle
+ * delay of T2 or better with a 200MHz PLB bus. Scanning the
+ * full list of WDTR/CLKTR should work, but currently it does not.
+ * HW team is investigating.
+ */
+/* List of (SDRAM_WRDTR.[WDTR], SDRAM_CLKTR.[CLKP]) pairs to try */
+struct sdram_timing quick_scan_options[] = {
+	{0, 3}, {1, 1}, {1, 2}, {1, 3},
+	{2, 1}, {2, 2}, {2, 3}, {3, 1},
+	{3, 2}, {4, 1}, {-1, -1}
+};
+
+ulong ddr_scan_option(ulong default_val)
+{
+	PPC4xx_SYS_INFO board_cfg;
+
+	get_sys_info(&board_cfg);
+
+	if (board_cfg.freqPLB >= 200000000)
+		return (ulong)(quick_scan_options);
+	else
+		return (ulong)default_val;
+}
+#endif /* CONFIG_PPC4xx_DDR_AUTOCALIBRATION */
cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +0 -5
index 83b9883..3ba8176 100644
@@ -79,11 +79,6 @@ struct ddrautocal {
 	u32 flags;
 };
 
-struct sdram_timing {
-	u32 wrdtr;
-	u32 clktr;
-};
-
 struct sdram_timing_clks {
 	u32 wrdtr;
 	u32 clktr;
include/asm-ppc/ppc4xx-sdram.h +6 -0
index 8efa557..2ba5619 100644
@@ -1403,6 +1403,12 @@
 #endif /* CONFIG_SDRAM_PPC4xx_DENALI_DDR2 */
 
 #ifndef __ASSEMBLY__
+
+struct sdram_timing {
+	u32 wrdtr;
+	u32 clktr;
+};
+
 /*
  * Prototypes
  */
Signature · 1 line
1.5.5
#1 lore raw

PATCH v2 1/1 ppc4xx: Fix DDR2 auto calibration on Kilauea 600MHz

Dear Victor,

Quoted 1 line · in message <[email protected]> you wrote:

...

Quoted 5 lines

+ * Use these scan options for PLB bus greater than or equal 200MHz
+ * else use the defaults. These options are known to return a cycle
+ * delay of T2 or better with a 200MHz PLB bus. Scanning the
+ * full list of WDTR/CLKTR should work, but currently it does not.
+ * HW team is investigating.

As you probably have noticed, I hesitate to pull the current patch into mainline, because it is still based on a temporary workaround.

Do you have any information when a clean solution for hte problem can be expected? I really would like to wait for the final patch.

What do you think?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
All your people must learn before you can reach for the stars.
	-- Kirk, "The Gamesters of Triskelion", stardate 3259.2