sunxi: h616: fix DRAM size detection
Subsystems (3)
Jernej Skrabec
maintainercover sunxi: h616: fix DRAM size detection
I got multiple reports that DRAM size is occasionally misdetected on H616. Some analysis revealed that issues are the same as on currently WIP A523 DRAM driver. Namely:
- size check might test outside H616 DRAM memory region
- only one dword pattern is not enough for memory aliasing testing
Following patches solve these two issues.
Best regards,
Jernej
Jernej Skrabec (2):
sunxi: h616: dram: Rework size detection
sunxi: H616: dram: Improve address wrapping detection
arch/arm/mach-sunxi/dram_sun50i_h616.c | 74 +++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 8 deletions(-)
Signature · 1 line
2.48.1
Jernej Skrabec
maintainerPATCH 1/2 sunxi: h616: dram: Rework size detection
Since there is quite a few possible DRAM configurations in terms of bus width, rank and rows and columns count, size detection algorithm must be very careful not to test combination which would be bigger than H616 is actually capable of handling.
Ideally, we should always detect memory aliasing, even for 4 GB memory size, which is the maximum amount of memory that H616 is capable of handling. For this reason, we have to configure minimum amount of supported rows when testing for columns and vice versa. This way test code will never step out of 4 GB boundary.
While at it, check for 17 rows maximum. This aligns code with BSP DRAM driver. There is probably no such configuration which would make sense with 4 GB memory.
--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/arm/mach-sunxi/dram_sun50i_h616.c +12 -8
@@ -1363,7 +1363,7 @@ static void mctl_auto_detect_rank_width(const struct dram_para *para,static void mctl_auto_detect_dram_size (const struct dram_para *para,struct dram_config *config) { -unsigned int shift; +unsigned int shift, cols, rows;/* max. config for columns, but not rows */ config->cols =11 ;
@@ -1373,23 +1373,27 @@ static void mctl_auto_detect_dram_size(const struct dram_para *para, shift = config->bus_full_width +1 ;/* detect column address bits */ -for (config->cols =8 ; config->cols <11 ; config->cols++) { -if (mctl_mem_matches (1ULL << (config->cols + shift))) +for (cols =8 ; cols <11 ; cols++) { +if (mctl_mem_matches (1ULL << (cols + shift)))break ; } -debug ("detected %u columns\n" , config->cols); +debug ("detected %u columns\n" , cols);/* reconfigure to make sure that all active rows are accessible */ - config->rows =18 ; + config->cols =8 ; + config->rows =17 ;mctl_core_init (para, config);/* detect row address bits */ shift = config->bus_full_width +4 + config->cols; -for (config->rows =13 ; config->rows <18 ; config->rows++) { -if (mctl_mem_matches (1ULL << (config->rows + shift))) +for (rows =13 ; rows <17 ; rows++) { +if (mctl_mem_matches (1ULL << (rows + shift)))break ; } -debug ("detected %u rows\n" , config->rows); +debug ("detected %u rows\n" , rows); + + config->cols = cols; + config->rows = rows; }static unsigned long mctl_calc_size (const struct dram_config *config)
Signature · 1 line
2.48.1
Re: [PATCH 1/2] sunxi: h616: dram: Rework size detection
Quoted 8 lines · 在 2025-03-09星期日的 07:31 +0100,Jernej Skrabec写道:
Since there is quite a few possible DRAM configurations in terms of bus
width, rank and rows and columns count, size detection algorithm must be
very careful not to test combination which would be bigger than H616 is
actually capable of handling.
Quoted 6 lines
Ideally, we should always detect memory aliasing, even for 4 GB memory
size, which is the maximum amount of memory that H616 is capable of handling. For this reason, we have to configure minimum amount of supported rows when testing for columns and vice versa. This way test code will never step out of 4 GB boundary.
This is also the behavior of previous DRAM drivers.
Quoted 6 lines
While at it, check for 17 rows maximum. This aligns code with BSP DRAM
driver. There is probably no such configuration which would make sense
with 4 GB memory.
I checked the JEDEC JESD79-4D document, and found that 18 rows are only available for x4 dies, which are not compatible with these Allwinner SoCs at all (not enough DQS pins).
Quoted 59 lines
Signed-off-by Jernej Skrabec <[email protected]>---
arch/arm/mach-sunxi/dram_sun50i_h616.c | 20 ++++++++++++--------1 file changed, 12 insertions(+), 8 deletions(-)arch/arm/mach- renamed from arch/arm/mach-sunxi/dram_sun50i_h616.c +0
-0
sunxi/dram_sun50i_h616.c
indexb3554cc64bf5..6f84e59e39cd100644arch/arm/mach-sunxi/dram_sun50i_h616.c +1
-1@@ -1363,7 +1363,7 @@ static void mctl_auto_detect_rank_width(conststruct dram_para *para, static void mctl_auto_detect_dram_size(const struct dram_para *para, struct dram_config *config) { - unsigned int shift; + unsigned int shift, cols, rows;
/* max. config for columns, but not rows */config->cols= 11;arch/arm/mach-sunxi/dram_sun50i_h616.c +0
-0@@ -1373,23 +1373,27 @@ static void mctl_auto_detect_dram_size(conststruct dram_para *para, shift = config->bus_full_width + 1;
/* detect column address bits */
- for (config->cols= 8;config->cols< 11; config->cols++) { - if (mctl_mem_matches(1ULL << (config->cols + shift))) + for (cols = 8; cols < 11; cols++) {
+ if (mctl_mem_matches(1ULL << (cols + shift))) break;
}
- debug("detected %u columns\n",config->cols);
+ debug("detected %u columns\n", cols);
/* reconfigure to make sure that all active rows are accessible */
- config->rows = 18;
+ config->cols = 8;
+ config->rows = 17;
mctl_core_init(para, config);
/* detect row address bits */
shift =config->bus_full_width+ 4 +config->cols; - for (config->rows= 13;config->rows< 18; config->rows++) { - if (mctl_mem_matches(1ULL << (config->rows + shift))) + for (rows = 13; rows < 17; rows++) {
+ if (mctl_mem_matches(1ULL << (rows + shift))) break;
}
- debug("detected %u rows\n",config->rows);
+ debug("detected %u rows\n", rows);
+
+ config->cols = cols;
+ config->rows = rows;
}
static unsigned longmctl_calc_size(const struct dram_config *config)
Re: [PATCH 1/2] sunxi: h616: dram: Rework size detection
In reply to Jernej SkrabecOn Sun, 9 Mar 2025 07:31:42 +0100
Jernej Skrabec <[email protected]> wrote:
Hi Jernej,
thanks for keeping digging into this long-standing problem!
Quoted 11 lines
Since there is quite a few possible DRAM configurations in terms of bus width, rank and rows and columns count, size detection algorithm must be very careful not to test combination which would be bigger than H616 is actually capable of handling.
Ideally, we should always detect memory aliasing, even for 4 GB memory size, which is the maximum amount of memory that H616 is capable of handling. For this reason, we have to configure minimum amount of supported rows when testing for columns and vice versa. This way test code will never step out of 4 GB boundary.
Quoted 5 lines
While at it, check for 17 rows maximum. This aligns code with BSP DRAM driver. There is probably no such configuration which would make sense with 4 GB memory.
Signed-off-by Jernej Skrabec <[email protected]>
The change itself looks good to me, I have not done enough tests myself to confirm its reliability, but I trust the reports from others who were more affected by this.
Cheers,
Andre
Quoted 52 lines
--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)arch/arm/mach-sunxi/dram_sun50i_h616.c +12
-8@@ -1363,7 +1363,7 @@ static void mctl_auto_detect_rank_width(const struct dram_para *para,static void mctl_auto_detect_dram_size (const struct dram_para *para,struct dram_config *config) { -unsigned int shift; +unsigned int shift, cols, rows;/* max. config for columns, but not rows */ config->cols =11 ;@@ -1373,23 +1373,27 @@ static void mctl_auto_detect_dram_size(const struct dram_para *para, shift = config->bus_full_width +1 ;/* detect column address bits */ -for (config->cols =8 ; config->cols <11 ; config->cols++) { -if (mctl_mem_matches (1ULL << (config->cols + shift))) +for (cols =8 ; cols <11 ; cols++) { +if (mctl_mem_matches (1ULL << (cols + shift)))break ; } -debug ("detected %u columns\n" , config->cols); +debug ("detected %u columns\n" , cols);/* reconfigure to make sure that all active rows are accessible */ - config->rows =18 ; + config->cols =8 ; + config->rows =17 ;mctl_core_init (para, config);/* detect row address bits */ shift = config->bus_full_width +4 + config->cols; -for (config->rows =13 ; config->rows <18 ; config->rows++) { -if (mctl_mem_matches (1ULL << (config->rows + shift))) +for (rows =13 ; rows <17 ; rows++) { +if (mctl_mem_matches (1ULL << (rows + shift)))break ; } -debug ("detected %u rows\n" , config->rows); +debug ("detected %u rows\n" , rows); + + config->cols = cols; + config->rows = rows; }static unsigned long mctl_calc_size (const struct dram_config *config)
Jernej Skrabec
maintainerPATCH 2/2 sunxi: H616: dram: Improve address wrapping detection
In reply to Jernej SkrabecIt turns out that checking just one write is not enough. Due to unexplained reasons scan procedure detected double the size. By making 16 dword writes and comparisons that never happens.
New procedure is also inverted. Instead of writing two different values to base address and some offset and then reading both and comparing values, simplify this by writing pattern at the base address and then search for this pattern at some offset.
--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 58 +++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-)
arch/arm/mach-sunxi/dram_sun50i_h616.c +56 -2
@@ -1360,38 +1360,92 @@ static void mctl_auto_detect_rank_width(const struct dram_para *para,panic ("This DRAM setup is currently not supported.\n" ); } +static void mctl_write_pattern (void ) +{ +unsigned int i; +u32 *ptr, val; + + ptr = (u32 *)CFG_SYS_SDRAM_BASE ; +for (i =0 ; i <16 ; ptr++, i++) { +if (i &1 ) + val = ~(ulong )ptr; +else + val = (ulong )ptr; +writel (val, ptr); + } +} + +static bool mctl_check_pattern (ulong offset) +{ +unsigned int i; +u32 *ptr, val; + + ptr = (u32 *)CFG_SYS_SDRAM_BASE ; +for (i =0 ; i <16 ; ptr++, i++) { +if (i &1 ) + val = ~(ulong )ptr; +else + val = (ulong )ptr; +if (val != *(ptr + offset /4 )) +return false; + } + +return true; +} +static void mctl_auto_detect_dram_size (const struct dram_para *para,struct dram_config *config) {unsigned int shift, cols, rows; +u32 buffer[16 ];/* max. config for columns, but not rows */ config->cols =11 ; config->rows =13 ;mctl_core_init (para, config); +/* +* Store content so it can be restored later. This is important +* if controller was already initialized and holds any data +* which is important for restoring system. +*/ +memcpy (buffer, (u32 *)CFG_SYS_SDRAM_BASE ,sizeof (buffer)); + +mctl_write_pattern (); + shift = config->bus_full_width +1 ;/* detect column address bits */ for (cols =8 ; cols <11 ; cols++) { -if (mctl_mem_matches (1ULL << (cols + shift))) +if (mctl_check_pattern (1ULL << (cols + shift)))break ; }debug ("detected %u columns\n" , cols); +/* restore data */ +memcpy ((u32 *)CFG_SYS_SDRAM_BASE , buffer,sizeof (buffer)); +/* reconfigure to make sure that all active rows are accessible */ config->cols =8 ; config->rows =17 ;mctl_core_init (para, config); +/* store data again as it might be moved */ +memcpy (buffer, (u32 *)CFG_SYS_SDRAM_BASE ,sizeof (buffer)); + +mctl_write_pattern (); +/* detect row address bits */ shift = config->bus_full_width +4 + config->cols;for (rows =13 ; rows <17 ; rows++) { -if (mctl_mem_matches (1ULL << (rows + shift))) +if (mctl_check_pattern (1ULL << (rows + shift)))break ; }debug ("detected %u rows\n" , rows); +/* restore data again */ +memcpy ((u32 *)CFG_SYS_SDRAM_BASE , buffer,sizeof (buffer)); + config->cols = cols; config->rows = rows; }
Signature · 1 line
2.48.1
Re: [PATCH 2/2] sunxi: H616: dram: Improve address wrapping detection
Quoted 9 lines · Jernej Skrabec
It turns out that checking just one write is not enough. Due to unexplained reasons scan procedure detected double the size. By making 16 dword writes and comparisons that never happens.
New procedure is also inverted. Instead of writing two different values to base address and some offset and then reading both and comparing values, simplify this by writing pattern at the base address and then search for this pattern at some offset.
Quoted 4 lines
Signed-off-by Jernej Skrabec <[email protected]>--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 58 +++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-)
Tested with H700 devices with both 1GB (RG35XX-H) and 4GB (RG40XX-V) of LPDDR4; reliable detection with over 50 boots combined on both devices. Previously ~1 in 10 boots would mistakenly incorrectly detect RAM size, in particular 2 or 4 GB RAM on the 1GB device.
Regards,
Ryan
Re: [PATCH 2/2] sunxi: H616: dram: Improve address wrapping detection
In reply to Jernej SkrabecOn Sun, 9 Mar 2025 07:31:43 +0100
Jernej Skrabec <[email protected]> wrote:
Hi,
Quoted 10 lines
It turns out that checking just one write is not enough. Due to unexplained reasons scan procedure detected double the size. By making 16 dword writes and comparisons that never happens.
New procedure is also inverted. Instead of writing two different values to base address and some offset and then reading both and comparing values, simplify this by writing pattern at the base address and then search for this pattern at some offset.
Signed-off-by Jernej Skrabec <[email protected]>
Thanks for improving this, I guess we want to eventually move this to more generic code, and use this for more SoCs?
Anyway:
Cheers,
Andre
Quoted 103 lines
--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 58 +++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-)arch/arm/mach-sunxi/dram_sun50i_h616.c +56
-2@@ -1360,38 +1360,92 @@ static void mctl_auto_detect_rank_width(const struct dram_para *para,panic ("This DRAM setup is currently not supported.\n" ); } +static void mctl_write_pattern (void ) +{ +unsigned int i; +u32 *ptr, val; + + ptr = (u32 *)CFG_SYS_SDRAM_BASE ; +for (i =0 ; i <16 ; ptr++, i++) { +if (i &1 ) + val = ~(ulong )ptr; +else + val = (ulong )ptr; +writel (val, ptr); + } +} + +static bool mctl_check_pattern (ulong offset) +{ +unsigned int i; +u32 *ptr, val; + + ptr = (u32 *)CFG_SYS_SDRAM_BASE ; +for (i =0 ; i <16 ; ptr++, i++) { +if (i &1 ) + val = ~(ulong )ptr; +else + val = (ulong )ptr; +if (val != *(ptr + offset /4 )) +return false; + } + +return true; +} +static void mctl_auto_detect_dram_size (const struct dram_para *para,struct dram_config *config) {unsigned int shift, cols, rows; +u32 buffer[16 ];/* max. config for columns, but not rows */ config->cols =11 ; config->rows =13 ;mctl_core_init (para, config); +/* +* Store content so it can be restored later. This is important +* if controller was already initialized and holds any data +* which is important for restoring system. +*/ +memcpy (buffer, (u32 *)CFG_SYS_SDRAM_BASE ,sizeof (buffer)); + +mctl_write_pattern (); + shift = config->bus_full_width +1 ;/* detect column address bits */ for (cols =8 ; cols <11 ; cols++) { -if (mctl_mem_matches (1ULL << (cols + shift))) +if (mctl_check_pattern (1ULL << (cols + shift)))break ; }debug ("detected %u columns\n" , cols); +/* restore data */ +memcpy ((u32 *)CFG_SYS_SDRAM_BASE , buffer,sizeof (buffer)); +/* reconfigure to make sure that all active rows are accessible */ config->cols =8 ; config->rows =17 ;mctl_core_init (para, config); +/* store data again as it might be moved */ +memcpy (buffer, (u32 *)CFG_SYS_SDRAM_BASE ,sizeof (buffer)); + +mctl_write_pattern (); +/* detect row address bits */ shift = config->bus_full_width +4 + config->cols;for (rows =13 ; rows <17 ; rows++) { -if (mctl_mem_matches (1ULL << (rows + shift))) +if (mctl_check_pattern (1ULL << (rows + shift)))break ; }debug ("detected %u rows\n" , rows); +/* restore data again */ +memcpy ((u32 *)CFG_SYS_SDRAM_BASE , buffer,sizeof (buffer)); + config->cols = cols; config->rows = rows; }