mx23: Make DDR initialization stable
Subsystems (2)
Fabio Estevam
reviewerv4 cover mx23: Make DDR initialization stable
Prior to this series running 'memtester' utility in Linux on a mx23evk always resulted in many errors during stress testing, if the kernel is loaded via U-boot.
Running the same test and loading the kernel via FSL bootlets resulted on zero errors.
Adjust U-boot so that it can also pass the 'memtester' stress test.
After this series was applied, no more DDR errors were observed on a mx23evk.
Fabio Estevam
reviewerPATCH v4 1/7 mx23: Fix pad voltage selection bit
From: Fabio Estevam <[email protected]>
On mx23 the pad voltage selection bit needs to be always '0', since '1' is a reserved value.
For example:
Pin 108, EMI_A06 pin voltage selection:
0= 1.8V (mDDR) or 2.5V (DDR1);
1= reserved.
Fix the pad voltage definitions for the mx23 case.
---
Changes since v3:
- Add Marek's ack
Changes since v2:
- Only place PAD_3V3 inside the if/else block
Changes since v1:
- Newly introduced
arch/arm/include/asm/arch-mxs/iomux.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/include/asm/arch-mxs/iomux.h +4 -0
@@ -71,7 +71,11 @@ typedef u32 iomux_cfg_t;#define PAD_16MA 3#define PAD_1V8 0 +#if definedCONFIG_MX28 #define PAD_3V3 1 +#else +#define PAD_3V3 0 +#endif #define PAD_NOPULL 0#define PAD_PULLUP 1
Signature · 1 line
1.7.9.5
PATCH v4 1/7 mx23: Fix pad voltage selection bit
Dear Fabio Estevam,
Quoted 31 lines
From: Fabio Estevam <[email protected]>
On mx23 the pad voltage selection bit needs to be always '0', since '1' is a reserved value.
For example:
Pin 108,
EMI_A06pin voltage selection:
0= 1.8V (mDDR) or 2.5V (DDR1);
1= reserved.Fix the pad voltage definitions for the mx23 case.
Signed-off-by Fabio Estevam <[email protected]>Acked-by Marek Vasut <[email protected]>---
Changes since v3:
- Add Marek's ack
Changes since v2:
- Only placePAD_3V3inside the if/else block
Changes since v1:
- Newly introducedarch/arm/include/asm/arch-mxs/iomux.h | 4 ++++ 1 file changed, 4 insertions(+)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/iomux.hindex 4288715..f46895e 100644
arch/arm/include/asm/arch-mxs/iomux.h typedef u32 iomux_cfg_t; · line 74
Quoted 4 lines
arch/arm/include/asm/arch-mxs/iomux.h +1
-0@@ -71,7 +71,11 @@ typedef u32 iomux_cfg_t;#define PAD_16MA 3#define PAD_1V8 0 +#if definedCONFIG_MX28
Uh, #if defined(CONFIG_MX28) ?
arch/arm/include/asm/arch-mxs/iomux.h typedef u32 iomux_cfg_t; · line 81
Quoted 7 lines
arch/arm/include/asm/arch-mxs/iomux.h +3
-0#define PAD_3V3 1 +#else +#define PAD_3V3 0 +#endif #define PAD_NOPULL 0#define PAD_PULLUP 1
Best regards,
Marek Vasut
Fabio Estevam
reviewerPATCH v4 2/7 mx23evk: Fix DDR pin iomux settings
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
Change MUX_CONFIG_EMI to use the same drive strength as the bootlets code from Freescale, which results in much better stability.
---
Changes since v3:
- None
Changes since v2:
- Only change the drive strength
Changes since v1:
- Only adjust MUX_CONFIG_EMI
board/freescale/mx23evk/spl_boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/freescale/mx23evk/spl_boot.c +1 -1
@@ -26,7 +26,7 @@#include <asm/arch/sys_proto.h> #define MUX_CONFIG_SSP1 (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP) -#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_16MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)const iomux_cfg_t iomux_setup[] = {/* DUART */
Signature · 1 line
1.7.9.5
Fabio Estevam
reviewerPATCH v4 3/7 mx23_olinuxino: Fix DDR pin iomux settings
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
Change MUX_CONFIG_EMI to use the same drive strength as the bootlets code from Freescale, which results in much better stability.
---
Changes since v3:
- None
Changes since v2:
- Only change the drive strength
Changes since v1:
- Only adjust MUX_CONFIG_EMI
board/olimex/mx23_olinuxino/spl_boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/olimex/mx23_olinuxino/spl_boot.c +1 -1
@@ -29,7 +29,7 @@#include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> -#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_16MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)#define MUX_CONFIG_SSP (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)const iomux_cfg_t iomux_setup[] = {
Signature · 1 line
1.7.9.5
Fabio Estevam
reviewerPATCH v4 4/7 mxs: spl_mem_init: Fix comment about start bit
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
Start bit is part of HW_DRAM_CTL8 register, so fix the comment.
---
Changes since v3:
- None
Changes since v2:
- None
Changes since v1:
- Newly introduced as the previous patch is now splitted.
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1 -1
@@ -267,7 +267,7 @@ static void mx23_mem_init(void)initialize_dram_values (); -/* Set START bit in DRAM_CTL16 */ +/* Set START bit in DRAM_CTL8 */ setbits_le32 (MXS_DRAM_BASE +0x20 ,1 <<16 );clrbits_le32 (MXS_DRAM_BASE +0x40 ,1 <<17 );
Signature · 1 line
1.7.9.5
Fabio Estevam
reviewerPATCH v4 5/7 mxs: spl_mem_init: Remove erroneous DDR setting
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
On mx23 there is no 'DRAM init complete' in register HW_DRAM_CTL18.
Remove this erroneous setting.
---
Changes since v3:
- None
Changes since v2:
- None
Changes since v1:
- Newly introduced as the previous patch is now splitted.
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 4 ---- 1 file changed, 4 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0 -4
@@ -279,10 +279,6 @@ static void mx23_mem_init(void)setbits_le32 (MXS_DRAM_BASE +0x40 ,1 <<19 ); setbits_le32(MXS_DRAM_BASE + 0x40, 1 << 11); - -/* Wait for bit 10 (DRAM init complete) in DRAM_CTL18 */ -while (!(readl (MXS_DRAM_BASE +0x48 ) & (1 <<10 ))) - ; }#endif
Signature · 1 line
1.7.9.5
Fabio Estevam
reviewerPATCH v4 6/7 mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
HW_DRAM_CTL27, HW_DRAM_CTL28 and HW_DRAM_CTL35 are not initialized as per FSL bootlets code.
mx23 Reference Manual mark HW_DRAM_CTL27 and HW_DRAM_CTL28 as "reserved".
HW_DRAM_CTL8 is setup as the last element.
So skip the initialization of these DRAM_CTL registers.
---
Changes since v3:
- Use continue
Changes since v2:
- None
Changes since v1:
- To avoid polluting the mx28 case, separate the function definition in mx23 and for mx28.
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +15 -2
@@ -110,6 +110,7 @@ __weak void mxs_adjust_memory_params(uint32_t *dram_vals) { } +#ifdef CONFIG_MX28 static void initialize_dram_values (void ) {int i;
@@ -118,15 +119,27 @@ static void initialize_dram_values(void)for (i =0 ; i <ARRAY_SIZE (dram_vals); i++) writel(dram_vals[i], MXS_DRAM_BASE + (4 * i)); +} +#else +static void initialize_dram_values (void ) +{ +int i; + +mxs_adjust_memory_params (dram_vals); + +for (i =0 ; i <ARRAY_SIZE (dram_vals); i++) { +if ((i ==8 || i ==27 || i ==28 || i ==35 )) +continue ; +writel (dram_vals[i],MXS_DRAM_BASE + (4 * i)); + } -#ifdef CONFIG_MX23 /* * Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last * element to be set */ writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 )); -#endif } +#endif static void mxs_mem_init_clock (void ) {
Signature · 1 line
1.7.9.5
PATCH v4 6/7 mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
Dear Fabio Estevam,
Quoted 38 lines
From: Fabio Estevam <[email protected]>
HW_DRAM_CTL27,HW_DRAM_CTL28andHW_DRAM_CTL35are not initialized as per FSL bootlets code.mx23 Reference Manual mark
HW_DRAM_CTL27andHW_DRAM_CTL28as "reserved".
HW_DRAM_CTL8is setup as the last element.So skip the initialization of these
DRAM_CTLregisters.Signed-off-by Fabio Estevam <[email protected]>---
Changes since v3:
- Use continue
Changes since v2:
- None
Changes since v1:
- To avoid polluting the mx28 case, separate the function definition in mx23 and for mx28.arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.cindex df25535..e599f31 100644arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1
-0@@ -110,6 +110,7 @@ __weak void mxs_adjust_memory_params(uint32_t *dram_vals) { } +#ifdef CONFIG_MX28 static void initialize_dram_values (void ) {int i;@@ -118,15 +119,27 @@ static void initialize_dram_values(void)for (i =0 ; i <ARRAY_SIZE (dram_vals); i++)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 130
Quoted 10 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +9
-0writel(dram_vals[i], MXS_DRAM_BASE + (4 * i)); +} +#else +static void initialize_dram_values (void ) +{ +int i; + +mxs_adjust_memory_params (dram_vals); + +for (i =0 ; i <ARRAY_SIZE (dram_vals); i++) {
I dunno if I should be bitching some more, but you have double (()) below. Some comment just here won't hurt, but whatever.
Quoted 7 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +4
-1+if ((i ==8 || i ==27 || i ==28 || i ==35 )) +continue ; +writel (dram_vals[i],MXS_DRAM_BASE + (4 * i)); + } -#ifdef CONFIG_MX23 /*
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 145
Quoted 10 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1
-1* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last * element to be set */ writel((1 << 24), MXS_DRAM_BASE + (4 * 8)); -#endif } +#endif static void mxs_mem_init_clock (void ) {
Best regards,
Marek Vasut
Fabio Estevam
reviewerPATCH v4 7/7 mxs: spl_mem_init: Change EMI port priority
In reply to Fabio EstevamFrom: Fabio Estevam <[email protected]>
FSL bootlets code set the PORT_PRIORITY_ORDER field of register HW_EMI_CTRL as 0x2, which means:
PORT0231 = 0x02 Priority Order: AXI0, AHB2, AHB3, AHB1
---
Changes since v3:
- None
Changes since v2:
- None
Changes since v1:
- None
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1 -1
@@ -287,7 +287,7 @@ static void mx23_mem_init(void)early_delay (20000 );/* Adjust EMI port priority. */ -clrsetbits_le32 (0x80020000 ,0x1f <<16 ,0x8 ); +clrsetbits_le32 (0x80020000 ,0x1f <<16 ,0x2 );early_delay (20000 );setbits_le32 (MXS_DRAM_BASE +0x40 ,1 <<19 );
Signature · 1 line
1.7.9.5