sunxi: dram: h6: Improve DDR3 config detection
Subsystems (3)
PATCH 1/1 sunxi: dram: h6: Improve DDR3 config detection
It turns out that in rare cases, current analytical approach to detect correct DRAM bus width and rank on H6 doesn't work. On some TV boxes with DDR3, incorrect DRAM configuration triggers write leveling error which immediately stops initialization process. Exact reason why this error appears isn't known. However, if correct configuration is used, initalization works without problem.
In order to fix this issue, simply try another configuration when any kind of error appears during initialization, not just those related to rank and bus width.
--- arch/arm/mach-sunxi/dram_sun50i_h6.c | 95 +++++++++++++++------------- 1 file changed, 51 insertions(+), 44 deletions(-)
arch/arm/mach-sunxi/dram_sun50i_h6.c +51 -44
@@ -37,9 +37,9 @@static void mctl_sys_init (struct dram_para *para);static void mctl_com_init (struct dram_para *para); -static void mctl_channel_init (struct dram_para *para); +static bool mctl_channel_init (struct dram_para *para); -static void mctl_core_init (struct dram_para *para) +static bool mctl_core_init (struct dram_para *para) {mctl_sys_init (para);mctl_com_init (para);
@@ -51,7 +51,7 @@ static void mctl_core_init(struct dram_para *para)default :panic ("Unsupported DRAM type!" ); }; -mctl_channel_init (para); +return mctl_channel_init (para); }/* PHY initialisation */
@@ -411,7 +411,7 @@ static void mctl_bit_delay_set(struct dram_para *para) } } -static void mctl_channel_init (struct dram_para *para) +static bool mctl_channel_init (struct dram_para *para) {struct sunxi_mctl_com_reg *const mctl_com = (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE ;
@@ -528,46 +528,15 @@ static void mctl_channel_init(struct dram_para *para)clrbits_le32 (&mctl_phy->dx[i].gcr[3 ], ~0x3ffff );udelay (10 ); -if (readl (&mctl_phy->pgsr[0 ]) &0x400000 ) - { -/* Check for single rank and optionally half DQ. */ -if ((readl (&mctl_phy->dx[0 ].rsr[0 ]) &0x3 ) ==2 && - (readl (&mctl_phy->dx[1 ].rsr[0 ]) &0x3 ) ==2 ) { - para->ranks =1 ; - -if ((readl (&mctl_phy->dx[2 ].rsr[0 ]) &0x3 ) !=2 || - (readl (&mctl_phy->dx[3 ].rsr[0 ]) &0x3 ) !=2 ) - para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch. */ -mctl_core_init (para); -return ; - } - -/* -* Check for dual rank and half DQ. NOTE: This combination -* is highly unlikely and was not tested. Condition is the -* same as in libdram, though. -*/ -if ((readl (&mctl_phy->dx[0 ].rsr[0 ]) &0x3 ) ==0 && - (readl (&mctl_phy->dx[1 ].rsr[0 ]) &0x3 ) ==0 ) { - para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch. */ -mctl_core_init (para); -return ; - } - -panic ("This DRAM setup is currently not supported.\n" ); - } -if (readl (&mctl_phy->pgsr[0 ]) &0xff00000 ) {/* Oops! There's something wrong! */ debug ("PLL = %x\n" ,readl (0x3001010 ));debug ("DRAM PHY PGSR0 = %x\n" ,readl (&mctl_phy->pgsr[0 ]));for (i =0 ; i <4 ; i++)debug ("DRAM PHY DX%dRSR0 = %x\n" , i,readl (&mctl_phy->dx[i].rsr[0 ])); -panic ("Error while initializing DRAM PHY!\n" ); +debug ("Error while initializing DRAM PHY!\n" ); + +return false; }if (sunxi_dram_is_lpddr (para->type))
@@ -582,13 +551,54 @@ static void mctl_channel_init(struct dram_para *para)writel (0xffffffff , &mctl_com->maer0);writel (0x7ff , &mctl_com->maer1);writel (0xffff , &mctl_com->maer2); + +return true; +} + +static void mctl_auto_detect_rank_width (struct dram_para *para) +{ +/* this is minimum size that it's supported */ + para->cols =8 ; + para->rows =13 ; + +/* +* Strategy here is to test most demanding combination first and least +* demanding last, otherwise HW might not be fully utilized. For +* example, half bus width and rank = 1 combination would also work +* on HW with full bus width and rank = 2, but only 1/4 RAM would be +* visible. +*/ + +debug ("testing 32-bit width, rank = 2\n" ); + para->bus_full_width =1 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 32-bit width, rank = 1\n" ); + para->bus_full_width =1 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 2\n" ); + para->bus_full_width =0 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 1\n" ); + para->bus_full_width =0 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +panic ("This DRAM setup is currently not supported.\n" ); }static void mctl_auto_detect_dram_size (struct dram_para *para) {/* TODO: non-(LP)DDR3 */ -/* Detect rank number and half DQ by the code in mctl_channel_init. */ -mctl_core_init (para);/* detect row address bits */ para->cols =8 ;
@@ -652,10 +662,6 @@ unsigned long sunxi_dram_init(void) (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE ;struct dram_para para = { .clk =CONFIG_DRAM_CLK , - .ranks =2 , - .cols =11 , - .rows =14 , - .bus_full_width =1 , #ifdef CONFIG_SUNXI_DRAM_H6_LPDDR3 .type =SUNXI_DRAM_TYPE_LPDDR3 , .dx_read_delays = SUN50I_H6_LPDDR3_DX_READ_DELAYS,
@@ -673,6 +679,7 @@ unsigned long sunxi_dram_init(void)setbits_le32 (0x7010310 ,BIT (8 ));clrbits_le32 (0x7010318 ,0x3f ); +mctl_auto_detect_rank_width (¶);mctl_auto_detect_dram_size (¶);mctl_core_init (¶);
Signature · 1 line
2.29.2
PATCH 1/1 sunxi: dram: h6: Improve DDR3 config detection
Quoted 10 lines · Jernej Skrabec
It turns out that in rare cases, current analytical approach to detect correct DRAM bus width and rank on H6 doesn't work. On some TV boxes with DDR3, incorrect DRAM configuration triggers write leveling error which immediately stops initialization process. Exact reason why this error appears isn't known. However, if correct configuration is used, initalization works without problem.
In order to fix this issue, simply try another configuration when any kind of error appears during initialization, not just those related to rank and bus width.
It's a bummer that this auto detection doesn't work, it looked to be the right thing.
But I prefer functionality over pipe dreams ;-)
Quoted 96 lines
Tested-by Thomas Graichen <[email protected]>Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/dram_sun50i_h6.c | 95 +++++++++++++++------------- 1 file changed, 51 insertions(+), 44 deletions(-)arch/arm/mach-sunxi/dram_sun50i_h6.c +8
-38@@ -37,9 +37,9 @@static void mctl_sys_init (struct dram_para *para);static void mctl_com_init (struct dram_para *para); -static void mctl_channel_init (struct dram_para *para); +static bool mctl_channel_init (struct dram_para *para); -static void mctl_core_init (struct dram_para *para) +static bool mctl_core_init (struct dram_para *para) {mctl_sys_init (para);mctl_com_init (para);@@ -51,7 +51,7 @@ static void mctl_core_init(struct dram_para *para)default :panic ("Unsupported DRAM type!" ); }; -mctl_channel_init (para); +return mctl_channel_init (para); }/* PHY initialisation */ @@ -411,7 +411,7 @@ static void mctl_bit_delay_set(struct dram_para *para) } } -static void mctl_channel_init (struct dram_para *para) +static bool mctl_channel_init (struct dram_para *para) {struct sunxi_mctl_com_reg *const mctl_com = (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE ;@@ -528,46 +528,15 @@ static void mctl_channel_init(struct dram_para *para)clrbits_le32 (&mctl_phy->dx[i].gcr[3 ], ~0x3ffff );udelay (10 ); -if (readl (&mctl_phy->pgsr[0 ]) &0x400000 ) - { -/* Check for single rank and optionally half DQ. */ -if ((readl (&mctl_phy->dx[0 ].rsr[0 ]) &0x3 ) ==2 && - (readl (&mctl_phy->dx[1 ].rsr[0 ]) &0x3 ) ==2 ) { - para->ranks =1 ; - -if ((readl (&mctl_phy->dx[2 ].rsr[0 ]) &0x3 ) !=2 || - (readl (&mctl_phy->dx[3 ].rsr[0 ]) &0x3 ) !=2 ) - para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch. */ -mctl_core_init (para); -return ; - } - -/* -* Check for dual rank and half DQ. NOTE: This combination -* is highly unlikely and was not tested. Condition is the -* same as in libdram, though. -*/ -if ((readl (&mctl_phy->dx[0 ].rsr[0 ]) &0x3 ) ==0 && - (readl (&mctl_phy->dx[1 ].rsr[0 ]) &0x3 ) ==0 ) { - para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch. */ -mctl_core_init (para); -return ; - } - -panic ("This DRAM setup is currently not supported.\n" ); - } -if (readl (&mctl_phy->pgsr[0 ]) &0xff00000 ) {/* Oops! There's something wrong! */ debug ("PLL = %x\n" ,readl (0x3001010 ));debug ("DRAM PHY PGSR0 = %x\n" ,readl (&mctl_phy->pgsr[0 ]));for (i =0 ; i <4 ; i++)debug ("DRAM PHY DX%dRSR0 = %x\n" , i,readl (&mctl_phy->dx[i].rsr[0 ])); -panic ("Error while initializing DRAM PHY!\n" ); +debug ("Error while initializing DRAM PHY!\n" ); + +return false; }if (sunxi_dram_is_lpddr (para->type))@@ -582,13 +551,54 @@ static void mctl_channel_init(struct dram_para *para)writel (0xffffffff , &mctl_com->maer0);writel (0x7ff , &mctl_com->maer1);writel (0xffff , &mctl_com->maer2); +
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para) · line 564
Quoted 10 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +10
-0+return true; +} + +static void mctl_auto_detect_rank_width (struct dram_para *para) +{ +/* this is minimum size that it's supported */ + para->cols =8 ; + para->rows =13 ; + +/*
Can you add here that former versions of this code tried to autodetect rank and width, but this didn't work reliably? This would give people some breadcrumbs to follow with git log/git annotate.
Otherwise this is fine:
I can extend the commit while committing, if you like.
Cheers,
Andre.
Quoted 62 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +33
-6+* Strategy here is to test most demanding combination first and least +* demanding last, otherwise HW might not be fully utilized. For +* example, half bus width and rank = 1 combination would also work +* on HW with full bus width and rank = 2, but only 1/4 RAM would be +* visible. +*/ + +debug ("testing 32-bit width, rank = 2\n" ); + para->bus_full_width =1 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 32-bit width, rank = 1\n" ); + para->bus_full_width =1 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 2\n" ); + para->bus_full_width =0 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 1\n" ); + para->bus_full_width =0 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +panic ("This DRAM setup is currently not supported.\n" ); }static void mctl_auto_detect_dram_size (struct dram_para *para) {/* TODO: non-(LP)DDR3 */ -/* Detect rank number and half DQ by the code in mctl_channel_init. */ -mctl_core_init (para);/* detect row address bits */ para->cols =8 ;@@ -652,10 +662,6 @@ unsigned long sunxi_dram_init(void) (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE ;struct dram_para para = { .clk =CONFIG_DRAM_CLK , - .ranks =2 , - .cols =11 , - .rows =14 , - .bus_full_width =1 , #ifdef CONFIG_SUNXI_DRAM_H6_LPDDR3 .type =SUNXI_DRAM_TYPE_LPDDR3 , .dx_read_delays = SUN50I_H6_LPDDR3_DX_READ_DELAYS,@@ -673,6 +679,7 @@ unsigned long sunxi_dram_init(void)setbits_le32 (0x7010310 ,BIT (8 ));clrbits_le32 (0x7010318 ,0x3f ); +mctl_auto_detect_rank_width (¶);mctl_auto_detect_dram_size (¶);mctl_core_init (¶);
PATCH 1/1 sunxi: dram: h6: Improve DDR3 config detection
Dne petek, 08. januar 2021 ob 03:01:42 CET je Andr? Przywara napisal(a):
Quoted 17 lines · Jernej Skrabec
Quoted 10 lines
It turns out that in rare cases, current analytical approach to detect correct DRAM bus width and rank on H6 doesn't work. On some TV boxes with DDR3, incorrect DRAM configuration triggers write leveling error which immediately stops initialization process. Exact reason why this error appears isn't known. However, if correct configuration is used, initalization works without problem.
In order to fix this issue, simply try another configuration when any kind of error appears during initialization, not just those related to rank and bus width.
It's a bummer that this auto detection doesn't work, it looked to be the right thing.
But I prefer functionality over pipe dreams ;-)Quoted 1 line
Quoted 7 lines
arch/arm/mach-sunxi/
Quoted 7 lines
Tested-by Thomas Graichen <[email protected]>Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/dram_sun50i_h6.c | 95 +++++++++++++++------------- 1 file changed, 51 insertions(+), 44 deletions(-)arch/arm/mach-sunxi/ renamed from arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-0
dram_sun50i_h6.c
Quoted 28 lines
Quoted 28 lines
index
9e34da474798..1cde6132be2c100644arch/arm/mach-sunxi/dram_sun50i_h6.c +3
-3@@ -37,9 +37,9 @@static void mctl_sys_init (struct dram_para *para);static void mctl_com_init (struct dram_para *para); -static void mctl_channel_init (struct dram_para *para); +static bool mctl_channel_init (struct dram_para *para); -static void mctl_core_init (struct dram_para *para) +static bool mctl_core_init (struct dram_para *para) {mctl_sys_init (para);mctl_com_init (para);@@ -51,7 +51,7 @@ static void mctl_core_init(struct dram_para *para)default :panic ("Unsupported DRAM type!" ); }; -mctl_channel_init (para); +return mctl_channel_init (para); }/* PHY initialisation */ @@ -411,7 +411,7 @@ static void mctl_bit_delay_set(struct dram_para *para) } }
Quoted 5 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_bit_delay_set(struct dram_para *para)
Quoted 5 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +1
-1-static void mctl_channel_init (struct dram_para *para) +static bool mctl_channel_init (struct dram_para *para) { struct sunxi_mctl_com_reg * const mctl_com = (struct sunxi_mctl_com_reg
*)SUNXI_DRAM_COM_BASE;
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-0@@ -528,46 +528,15 @@ static void mctl_channel_init(struct dram_para
*para)
Quoted 11 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 11 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-8clrbits_le32 (&mctl_phy->dx[i].gcr[3 ], ~0x3ffff );udelay (10 ); - if (readl(&mctl_phy->pgsr[0]) & 0x400000) - { - /* Check for single rank and optionally half DQ. */ - if ((readl(&mctl_phy->dx[0].rsr[0]) & 0x3) == 2 && - (readl(&mctl_phy->dx[1].rsr[0]) & 0x3) == 2) { - para->ranks = 1; - - if ((readl(&mctl_phy->dx[2].rsr[0]) & 0x3) !
= 2 ||
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para · line 539
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-1- (readl(&mctl_phy->dx[3].rsr[0]) & 0x3) !
= 2)
Quoted 3 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 3 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-3- para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch.
*/
Quoted 6 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 6 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-6-mctl_core_init (para); -return ; - } - -/* -* Check for dual rank and half DQ. NOTE: This
combination
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para · line 549
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-1-* is highly unlikely and was not tested. Condition is
the
Quoted 7 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 7 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-7-* same as in libdram, though. -*/ -if ((readl (&mctl_phy->dx[0 ].rsr[0 ]) &0x3 ) ==0 && - (readl (&mctl_phy->dx[1 ].rsr[0 ]) &0x3 ) ==0 ) { - para->bus_full_width =0 ; - -/* Restart DRAM initialization from scratch.
*/
Quoted 4 lines
Quoted 4 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-4-mctl_core_init (para); -return ; - } -
Quoted 10 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 7 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-3-panic ("This DRAM setup is currently not supported.\n" ); - } -if (readl (&mctl_phy->pgsr[0 ]) &0xff00000 ) {/* Oops! There's something wrong! */ debug ("PLL = %x\n" ,readl (0x3001010 )); debug("DRAM PHY PGSR0 = %x\n", readl(&mctl_phy-pgsr[0]));
Quoted 2 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-0for (i =0 ; i <4 ; i++) debug("DRAM PHY DX%dRSR0 = %x\n", i,
readl(&mctl_phy->dx[i].rsr[0]));
Quoted 8 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para
Quoted 8 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +3
-1-panic ("Error while initializing DRAM PHY!\n" ); +debug ("Error while initializing DRAM PHY!\n" ); + +return false; }if (sunxi_dram_is_lpddr (para->type))@@ -582,13 +551,54 @@ static void mctl_channel_init(struct dram_para
*para)
Quoted 19 lines
Quoted 4 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +1
-0writel (0xffffffff , &mctl_com->maer0);writel (0x7ff , &mctl_com->maer1);writel (0xffff , &mctl_com->maer2); +arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para) · line 564
Quoted 10 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +10
-0+return true; +} + +static void mctl_auto_detect_rank_width (struct dram_para *para) +{ +/* this is minimum size that it's supported */ + para->cols =8 ; + para->rows =13 ; + +/* Can you add here that former versions of this code tried to autodetect rank and width, but this didn't work reliably? This would give people some breadcrumbs to follow with git log/git annotate.
Quoted 6 lines
Otherwise this is fine:
Reviewed-by Andre Przywara <[email protected]>I can extend the commit while committing, if you like.
Please do. Thanks!
Best regards,
Jernej
Quoted 6 lines
Cheers,
Andre.arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para · line 565
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c +1
-0+* Strategy here is to test most demanding combination first and
least
Quoted 2 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para · line 567
Quoted 2 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +2
-0+* demanding last, otherwise HW might not be fully utilized. For +* example, half bus width and rank = 1 combination would also
work
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para · line 568
Quoted 1 line
arch/arm/mach-sunxi/dram_sun50i_h6.c +1
-0+* on HW with full bus width and rank = 2, but only 1/4 RAM would
be
Quoted 30 lines
Quoted 30 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +28
-0+* visible. +*/ + +debug ("testing 32-bit width, rank = 2\n" ); + para->bus_full_width =1 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 32-bit width, rank = 1\n" ); + para->bus_full_width =1 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 2\n" ); + para->bus_full_width =0 ; + para->ranks =2 ; +if (mctl_core_init (para)) +return ; + +debug ("testing 16-bit width, rank = 1\n" ); + para->bus_full_width =0 ; + para->ranks =1 ; +if (mctl_core_init (para)) +return ; + +panic ("This DRAM setup is currently not supported.\n" ); }
Quoted 4 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para)
Quoted 4 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-1static void mctl_auto_detect_dram_size (struct dram_para *para) {/* TODO: non-(LP)DDR3 */ -/* Detect rank number and half DQ by the code in
mctl_channel_init. */
Quoted 6 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c unsigned long sunxi_dram_init(void) · line 662
Quoted 6 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +0
-1-mctl_core_init (para);/* detect row address bits */ para->cols =8 ;@@ -652,10 +662,6 @@ unsigned long sunxi_dram_init(void) (struct sunxi_mctl_com_reg
*)SUNXI_DRAM_COM_BASE;
Quoted 20 lines
Quoted 18 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +1
-4struct dram_para para = { .clk =CONFIG_DRAM_CLK , - .ranks =2 , - .cols =11 , - .rows =14 , - .bus_full_width =1 , #ifdef CONFIG_SUNXI_DRAM_H6_LPDDR3 .type =SUNXI_DRAM_TYPE_LPDDR3 , .dx_read_delays = SUN50I_H6_LPDDR3_DX_READ_DELAYS,@@ -673,6 +679,7 @@ unsigned long sunxi_dram_init(void)setbits_le32 (0x7010310 ,BIT (8 ));clrbits_le32 (0x7010318 ,0x3f ); +mctl_auto_detect_rank_width (¶);mctl_auto_detect_dram_size (¶);mctl_core_init (¶);
PATCH 1/1 sunxi: dram: h6: Improve DDR3 config detection
Quoted 20 lines · Jernej ?krabec
Dne petek, 08. januar 2021 ob 03:01:42 CET je Andr? Przywara napisal(a):
Quoted 19 lines · Jernej Skrabec
Quoted 10 lines
It turns out that in rare cases, current analytical approach to detect correct DRAM bus width and rank on H6 doesn't work. On some TV boxes with DDR3, incorrect DRAM configuration triggers write leveling error which immediately stops initialization process. Exact reason why this error appears isn't known. However, if correct configuration is used, initalization works without problem.
In order to fix this issue, simply try another configuration when any kind of error appears during initialization, not just those related to rank and bus width.
It's a bummer that this auto detection doesn't work, it looked to be the right thing.
But I prefer functionality over pipe dreams ;-)Quoted 3 lines
Tested-by Thomas Graichen <[email protected]>Signed-off-by Jernej Skrabec <[email protected]>
...
Quoted 12 lines
Quoted 12 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c static void mctl_channel_init(struct dram_para *para) · line 564
Quoted 7 lines
arch/arm/mach-sunxi/dram_sun50i_h6.c +7
-0+static void mctl_auto_detect_rank_width (struct dram_para *para) +{ +/* this is minimum size that it's supported */ + para->cols =8 ; + para->rows =13 ; + +/* Can you add here that former versions of this code tried to autodetect rank and width, but this didn't work reliably? This would give people some breadcrumbs to follow with git log/git annotate.
Quoted 8 lines
Quoted 6 lines
Otherwise this is fine:
Reviewed-by Andre Przywara <[email protected]>I can extend the commit while committing, if you like.
Please do. Thanks!
Done and applied!
Thanks,
Andre