arm: omap: emif: Support for ddr3 after warm reset
PATCH 1/1 arm: omap: emif: Support for ddr3 after warm reset
EMIF supports a global warm reset mode, during which the EMIF keeps the SDRAM content. But if leveling is enabled at the time of warm reset for DDR3, the following steps needs to be done after warm reset:
1) Keep EMIF in self refresh mode.
2) Reset PHY to bring back the PHY to a known state.
3) Start Levelling procedure.
Doing the same.
And also enabling DLL lock and code output after warm reset.
Tested on OMAP5432 ES2.0
--- arch/arm/cpu/armv7/omap-common/emif-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/omap-common/emif-common.c +9 -3
@@ -1072,6 +1072,12 @@ static void do_sdram_init(u32 base)else ddr3_init (base, regs); } +if (!in_sdram &&warm_reset () && + (emif_sdram_type () ==EMIF_SDRAM_TYPE_DDR3 )) { +set_lpmode_selfrefresh (base); +emif_reset_phy (base); +ddr3_leveling (base, regs); + }/* Write to the shadow registers */ emif_update_timings (base, regs);
@@ -1259,10 +1265,10 @@ void sdram_init(void) in_sdram =running_from_sdram ();debug ("in_sdram = %d\n" , in_sdram); -if (!(in_sdram ||warm_reset ())) { -if (sdram_type ==EMIF_SDRAM_TYPE_LPDDR2 ) +if (!in_sdram) { +if ((sdram_type ==EMIF_SDRAM_TYPE_LPDDR2 ) && !warm_reset ())bypass_dpll ((*prcm)->cm_clkmode_dpll_core); -else +else if (sdram_type ==EMIF_SDRAM_TYPE_DDR3 )writel (CM_DLL_CTRL_NO_OVERRIDE , (*prcm)->cm_dll_ctrl); }
Signature · 1 line
1.7.9.5
PATCH 1/1 arm: omap: emif: Support for ddr3 after warm reset
Quoted 10 lines · Lokesh Vutla
EMIF supports a global warm reset mode, during which the EMIF keeps the SDRAM content. But if leveling is enabled at the time of warm reset for DDR3, the following steps needs to be done after warm reset:
1) Keep EMIF in self refresh mode.
2) Reset PHY to bring back the PHY to a known state.
3) Start Levelling procedure.
Doing the same.
And also enabling DLL lock and code output after warm reset.
Should the $subject be something like
Fix DDR3 initialisation after warm reset ?
Quoted 12 lines
Tested on OMAP5432 ES2.0
Signed-off-by Lokesh Vutla <[email protected]>--- arch/arm/cpu/armv7/omap-common/emif-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)arch/arm/cpu/armv7/omap-common/emif-common.c +0
-0
arch/arm/cpu/armv7/omap-common/emif-common.c static void do_sdram_init(u32 base) · line 1081
Quoted 10 lines
arch/arm/cpu/armv7/omap-common/emif-common.c +6
-0@@ -1072,6 +1072,12 @@ static void do_sdram_init(u32 base)else ddr3_init (base, regs); } +if (!in_sdram &&warm_reset () && + (emif_sdram_type () ==EMIF_SDRAM_TYPE_DDR3 )) { +set_lpmode_selfrefresh (base); +emif_reset_phy (base); +ddr3_leveling (base, regs); + }
Why do we need !in_sdram check here ?. Otherwise, good..
Regards,
Sricharan
PATCH 1/1 arm: omap: emif: Support for ddr3 after warm reset
Quoted 12 lines · Sricharan R
Quoted 10 lines · Lokesh Vutla
EMIF supports a global warm reset mode, during which the EMIF keeps the SDRAM content. But if leveling is enabled at the time of warm reset for DDR3, the following steps needs to be done after warm reset:
1) Keep EMIF in self refresh mode.
2) Reset PHY to bring back the PHY to a known state.
3) Start Levelling procedure.
Doing the same.
And also enabling DLL lock and code output after warm reset.
Quoted 2 lines
Should the $subject be something like
Fix DDR3 initialisation after warm reset ?
Ok I ll change it.
Quoted 17 lines
Quoted 17 lines
Tested on OMAP5432 ES2.0
Signed-off-by Lokesh Vutla <[email protected]>--- arch/arm/cpu/armv7/omap-common/emif-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)arch/arm/cpu/armv7/omap-common/emif-common.c +1
-0@@ -1072,6 +1072,12 @@ static void do_sdram_init(u32 base)else ddr3_init (base, regs); } + if (!in_sdram && warm_reset() &&
Quoted 8 lines
arch/arm/cpu/armv7/omap-common/emif-common.c static void do_sdram_init(u32 base) · line 1081
Quoted 6 lines
arch/arm/cpu/armv7/omap-common/emif-common.c +5
-0+ (emif_sdram_type() == EMIF_SDRAM_TYPE_DDR3)) { +set_lpmode_selfrefresh (base); +emif_reset_phy (base); +ddr3_leveling (base, regs); + }Why do we need !in_sdram check here ?. Otherwise, good..
DDR3 leveling cannot happen from SDRAM. So I kept a check here.
Thanks and Regards,
Lokesh
Quoted 7 lines
Reviewed-by R Sricharan <[email protected]>Regards,
Sricharan