Expand POST memory test to support arch-depended implementation.
PATCH v3 1/7 Expand POST memory test to support arch-depended implementation.
Add weak functions to enable architecture depended preparation, address advancing, cleaning up and error handling.
These weak functions provides the framwork to implemente arch/platform dependent code for initializing/maintenance/restore the start address, size, physical address as well as memory mapping before/between/after memory test. arch_memory_failure_handle can also be implemented in case more care is needed for arch/platform.
--- post/drivers/memory.c | 68 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 52 insertions(+), 16 deletions(-)
post/drivers/memory.c +52 -16
@@ -452,30 +452,66 @@ static int memory_post_tests (unsigned long start, unsigned long size)return ret; } -int memory_post_test (int flags) +__attribute__((weak)) +int arch_memory_test_prepare (u32 *vstart,u32 *size,phys_addr_t *phys_offset) { -int ret =0 ;bd_t *bd = gd->bd; -unsigned long memsize = (bd->bi_memsize >=256 <<20 ? -256 <<20 : bd->bi_memsize) - (1 <<20 ); + *vstart =CONFIG_SYS_SDRAM_BASE ; + *size = (bd->bi_memsize >=256 <<20 ? +256 <<20 : bd->bi_memsize) - (1 <<20 );/* Limit area to be tested with the board info struct */ -if (CONFIG_SYS_SDRAM_BASE + memsize > (ulong )bd) - memsize = (ulong )bd -CONFIG_SYS_SDRAM_BASE ; +if ((*vstart) + (*size) > (ulong )bd) + *size = (ulong )bd - *vstart; + +return 0 ; +} -if (flags &POST_SLOWTEST ) { - ret =memory_post_tests (CONFIG_SYS_SDRAM_BASE , memsize); - }else {/* POST_NORMAL */ +__attribute__((weak)) +int arch_memory_test_advance (u32 *vstart,u32 *size,phys_addr_t *phys_offset) +{ +return 1 ; +} -unsigned long i; +__attribute__((weak)) +int arch_memory_test_cleanup (u32 *vstart,u32 *size,phys_addr_t *phys_offset) +{ +return 0 ; +} -for (i =0 ; i < (memsize >>20 ) && ret ==0 ; i++) { -if (ret ==0 ) - ret =memory_post_tests (i <<20 ,0x800 ); -if (ret ==0 ) - ret =memory_post_tests ((i <<20 ) +0xff800 ,0x800 ); +__attribute__((weak)) +void arch_memory_failure_handle (void ) +{ +return ; +} + +int memory_post_test (int flags) +{ +int ret =0 ; +phys_addr_t phys_offset =0 ; +u32 memsize, vstart; + +arch_memory_test_prepare (&vstart, &memsize, &phys_offset); + +do { +if (flags &POST_SLOWTEST ) { + ret =memory_post_tests (vstart, memsize); + }else {/* POST_NORMAL */ +unsigned long i; +for (i =0 ; i < (memsize >>20 ) && ret ==0 ; i++) { +if (ret ==0 ) + ret =memory_post_tests (i <<20 ,0x800 ); +if (ret ==0 ) + ret =memory_post_tests ( + (i <<20 ) +0xff800 ,0x800 ); + } } - } + }while (!ret && + !arch_memory_test_advance (&vstart, &memsize, &phys_offset)); + +arch_memory_test_cleanup (&vstart, &memsize, &phys_offset); +if (ret) +arch_memory_failure_handle ();return ret; }
Signature · 1 line
1.7.0.4
PATCH v3 2/7 Adding more control to physical address mapping
A worker function setup_ddr_tlbs_phys() is introduced to implement more control on physical address mapping.
--- arch/powerpc/cpu/mpc85xx/tlb.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
arch/powerpc/cpu/mpc85xx/tlb.c +10 -6
@@ -245,7 +245,8 @@ void init_addr_map(void) }#endif -unsigned int setup_ddr_tlbs (unsigned int memsize_in_meg) +unsigned int +setup_ddr_tlbs_phys (phys_addr_t p_addr,unsigned int memsize_in_meg) {int i;unsigned int tlb_size;
@@ -275,21 +276,24 @@ unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg) tlb_size = (camsize -10 ) /2 ; -set_tlb (1 , ram_tlb_address, ram_tlb_address, +set_tlb (1 , ram_tlb_address, p_addr,MAS3_SX |MAS3_SW |MAS3_SR ,0 ,0 , ram_tlb_index, tlb_size,1 ); size -=1ULL << camsize; memsize -=1ULL << camsize; ram_tlb_address +=1UL << camsize; + p_addr += 1UL << camsize; }if (memsize)print_size (memsize," left unmapped\n" ); - -/* -* Confirm that the requested amount of memory was mapped. -*/ return memsize_in_meg; } + +unsigned int setup_ddr_tlbs (unsigned int memsize_in_meg) +{ +return +setup_ddr_tlbs_phys (CONFIG_SYS_DDR_SDRAM_BASE , memsize_in_meg); +}#endif /* !CONFIG_NAND_SPL */
Signature · 1 line
1.7.0.4
Kumar Gala
AppliedPATCH v3 2/7 Adding more control to physical address mapping
Quoted 7 lines · York Sun
A worker function
setup_ddr_tlbs_phys()is introduced to implement more control on physical address mapping.Signed-off-by York Sun <[email protected]>---
arch/powerpc/cpu/mpc85xx/tlb.c| 16 ++++++++++------1 files changed, 10 insertions(+), 6 deletions(-)
applied to 85xx
- k
PATCH v3 3/7 Add memory test feature for mpc85xx POST.
In reply to York SunThe memory test is performed after DDR initialization when U-boot stills runs in flash and cache. On recent mpc85xx platforms, the total memory can be more than 2GB. To cover whole memory, it needs be mapped 2GB at a time using a sliding TLB window. After the testing, DDR is remapped with up to 2GB memory from the lowest address as normal.
If memory test fails, DDR DIMM SPD and DDR controller registers are dumped for further debugging.
--- arch/powerpc/cpu/mpc85xx/cpu.c | 219 ++++++++++++++++++++++++++++++++++++++++ doc/README.fsl-ddr | 14 +++ 2 files changed, 233 insertions(+), 0 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu.c +219 -0
@@ -34,6 +34,9 @@#include <asm/io.h> #include <asm/mmu.h> #include <asm/fsl_law.h> +#include <post.h> +#include <asm/processor.h> +#include <asm/fsl_ddr_sdram.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -282,3 +285,219 @@ void mpc85xx_reginfo(void)print_laws ();print_lbc_regs (); } + +#if CONFIG_POST &CONFIG_SYS_POST_MEMORY + +/* Board-specific functions defined in each board's ddr.c */ +void fsl_ddr_get_spd (generic_spd_eeprom_t *ctrl_dimms_spd, +unsigned int ctrl_num); +void read_tlbcam_entry (int idx,u32 *valid,u32 *tsize,unsigned long *epn, +phys_addr_t *rpn); +unsigned int +setup_ddr_tlbs_phys (phys_addr_t p_addr,unsigned int memsize_in_meg); + +static void dump_spd_ddr_reg (void ) +{ +int i, j, k, m; +u8 *p_8; +u32 *p_32; +ccsr_ddr_t *ddr[CONFIG_NUM_DDR_CONTROLLERS ]; +generic_spd_eeprom_t + spd[CONFIG_NUM_DDR_CONTROLLERS ][CONFIG_DIMM_SLOTS_PER_CTLR ]; + +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) +fsl_ddr_get_spd (spd[i], i); + +puts ("SPD data of all dimms (zero vaule is omitted)...\n" ); +puts ("Byte (hex) " ); + k =1 ; +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) { +for (j =0 ; j <CONFIG_DIMM_SLOTS_PER_CTLR ; j++) +printf ("Dimm%d " , k++); + } +puts ("\n" ); +for (k =0 ; k <sizeof (generic_spd_eeprom_t); k++) { + m =0 ; +printf ("%3d (0x%02x) " , k, k); +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) { +for (j =0 ; j <CONFIG_DIMM_SLOTS_PER_CTLR ; j++) { + p_8 = (u8 *) &spd[i][j]; +if (p_8[k]) { +printf ("0x%02x " , p_8[k]); + m++; + }else +puts (" " ); + } + } +if (m) +puts ("\n" ); +else +puts ("\r" ); + } + +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) { +switch (i) { +case 0 : + ddr[i] = (void *)CONFIG_SYS_MPC85xx_DDR_ADDR; +break ; +#ifdef CONFIG_SYS_MPC85xx_DDR2_ADDR +case 1 : + ddr[i] = (void *)CONFIG_SYS_MPC85xx_DDR2_ADDR; +break ; +#endif +default : +printf ("%s unexpected controller number = %u\n" , + __func__, i); +return ; + } + } +printf ("DDR registers dump for all controllers " +"(zero vaule is omitted)...\n" ); +puts ("Offset (hex) " ); +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) +printf (" Base + 0x%04x" , (u32 )ddr[i] &0xFFFF ); +puts ("\n" ); +for (k =0 ; k <sizeof (ccsr_ddr_t)/4 ; k++) { + m =0 ; +printf ("%6d (0x%04x)" , k *4 , k *4 ); +for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) { + p_32 = (u32 *) ddr[i]; +if (p_32[k]) { +printf (" 0x%08x" , p_32[k]); + m++; + }else +puts (" " ); + } +if (m) +puts ("\n" ); +else +puts ("\r" ); + } +puts ("\n" ); +} + +/* invalid the TLBs for DDR and setup new ones to cover p_addr */ +static int reset_tlb (phys_addr_t p_addr,u32 size,phys_addr_t *phys_offset) +{ +u32 vstart =CONFIG_SYS_DDR_SDRAM_BASE ; +unsigned long epn; +u32 tsize, valid, ptr; +phys_addr_t rpn =0 ; +int ddr_esel; + + ptr = vstart; + +while (ptr < (vstart + size)) { + ddr_esel =find_tlb_idx ((void *)ptr,1 ); +if (ddr_esel !=-1 ) { +read_tlbcam_entry (ddr_esel, &valid, &tsize, &epn, &rpn); +disable_tlb (ddr_esel); + } + ptr +=TSIZE_TO_BYTES (tsize); + } + +/* Setup new tlb to cover the physical address */ +setup_ddr_tlbs_phys (p_addr, size>>20 ); + + ptr = vstart; + ddr_esel =find_tlb_idx ((void *)ptr,1 ); +if (ddr_esel !=-1 ) { +read_tlbcam_entry (ddr_esel, &valid, &tsize, &epn, phys_offset); + }else { +printf ("TLB error in function %s\n" , __func__); +return -1 ; + } + +return 0 ; +} + +/* +* slide the testing window up to test another area +* for 32_bit system, the maximum testable memory is limited to +* CONFIG_MAX_MEM_MAPPED +*/ +int arch_memory_test_advance (u32 *vstart,u32 *size,phys_addr_t *phys_offset) +{ +phys_addr_t test_cap, p_addr; +phys_size_t p_size =min (gd->ram_size,CONFIG_MAX_MEM_MAPPED ); + +#if !defined(CONFIG_PHYS_64BIT ) || \ + !defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS ) || \ + (CONFIG_SYS_INIT_RAM_ADDR_PHYS <0x100000000ull ) + test_cap = p_size; +#else + test_cap = gd->ram_size; +#endif + p_addr = (*vstart) + (*size) + (*phys_offset); +if (p_addr < test_cap -1 ) { + p_size =min (test_cap - p_addr,CONFIG_MAX_MEM_MAPPED ); +if (reset_tlb (p_addr, p_size, phys_offset) ==-1 ) +return -1 ; + *vstart =CONFIG_SYS_DDR_SDRAM_BASE ; + *size = (u32 ) p_size; +printf ("Testing 0x%08llx - 0x%08llx\n" , + (u64)(*vstart) + (*phys_offset), + (u64)(*vstart) + (*phys_offset) + (*size) -1 ); + }else +return 1 ; + +return 0 ; +} + +/* initialization for testing area */ +int arch_memory_test_prepare (u32 *vstart,u32 *size,phys_addr_t *phys_offset) +{ +phys_size_t p_size =min (gd->ram_size,CONFIG_MAX_MEM_MAPPED ); + + *vstart =CONFIG_SYS_DDR_SDRAM_BASE ; + *size = (u32 ) p_size;/* CONFIG_MAX_MEM_MAPPED < 4G */ + *phys_offset =0 ; + +#if !defined(CONFIG_PHYS_64BIT ) || \ + !defined(CONFIG_SYS_INIT_RAM_ADDR_PHYS ) || \ + (CONFIG_SYS_INIT_RAM_ADDR_PHYS <0x100000000ull ) +if (gd->ram_size >CONFIG_MAX_MEM_MAPPED ) { +puts ("Cannot test more than " ); +print_size (CONFIG_MAX_MEM_MAPPED , +" without proper 36BIT support.\n" ); + } +#endif +printf ("Testing 0x%08llx - 0x%08llx\n" , + (u64)(*vstart) + (*phys_offset), + (u64)(*vstart) + (*phys_offset) + (*size) -1 ); + +return 0 ; +} + +/* invalid TLBs for DDR and remap as normal after testing */ +int arch_memory_test_cleanup (u32 *vstart,u32 *size,phys_addr_t *phys_offset) +{ +unsigned long epn; +u32 tsize, valid, ptr; +phys_addr_t rpn =0 ; +int ddr_esel; + +/* disable the TLBs for this testing */ + ptr = *vstart; + +while (ptr < (*vstart) + (*size)) { + ddr_esel =find_tlb_idx ((void *)ptr,1 ); +if (ddr_esel !=-1 ) { +read_tlbcam_entry (ddr_esel, &valid, &tsize, &epn, &rpn); +disable_tlb (ddr_esel); + } + ptr +=TSIZE_TO_BYTES (tsize); + } + +puts ("Remap DDR " ); +setup_ddr_tlbs (gd->ram_size>>20 ); +puts ("\n" ); + +return 0 ; +} + +void arch_memory_failure_handle (void ) +{ +dump_spd_ddr_reg (); +} +#endif
doc/README.fsl-ddr +14 -0
@@ -78,6 +78,20 @@ If the DDR controller supports address hashing, it can be enabled by hwconfig. Syntax is: hwconfig=fsl_ddr:addr_hash=true + +Memory testing options for mpc85xx +================================== +1. Memory test can be done once U-boot prompt comes up using mtest, or +2. Memory test can be done with Power-On-Self-Test function, activated at + compile time. + + In order to enable the POST memory test, CONFIG_POST needs to be + defined in board configuraiton header file. By default, POST memory test + performs a fast test. A slow test can be enabled by changing the flag at + compiling time. To test memory bigger than 2GB, 36BIT support is needed. + Memory is tested within a 2GB window. TLBs are used to map the virtual 2GB + window to physical address so that all physical memory can be tested. + Combination of hwconfig ======================= Hwconfig can be combined with multiple parameters, for example, on a supported
Signature · 1 line
1.7.0.4
Kumar Gala
AppliedPATCH v3 3/7 Add memory test feature for mpc85xx POST.
Quoted 6 lines · York Sun
The memory test is performed after DDR initialization when U-boot stills runs in flash and cache. On recent mpc85xx platforms, the total memory can be more than 2GB. To cover whole memory, it needs be mapped 2GB at a time using a sliding TLB window. After the testing, DDR is remapped with up to 2GB memory from the lowest address as normal.
Quoted 8 lines
If memory test fails, DDR DIMM SPD and DDR controller registers are dumped for further debugging.
Signed-off-by York Sun <[email protected]>---
arch/powerpc/cpu/mpc85xx/cpu.c| 219 ++++++++++++++++++++++++++++++++++++++++
doc/README.fsl-ddr | 14 +++2 files changed, 233 insertions(+), 0 deletions(-)
applied to 85xx
- k
PATCH v3 4/7 Fix address for POST for 85xx with CPM
In reply to York SunThe address used for post_word_load and post_word_store is in the dual port RAM for processors with CPM.
--- arch/powerpc/cpu/mpc85xx/commproc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc85xx/commproc.c +4 -4
@@ -188,16 +188,16 @@ m8560_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)void post_word_store (ulong a) { -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); +volatile ulong *save_addr = (volatile ulong *) + (CONFIG_SYS_MPC85xx_CPM_ADDR +CPM_POST_WORD_ADDR ); *save_addr = a; }ulong post_word_load (void ) { -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); +volatile ulong *save_addr = (volatile ulong *) + (CONFIG_SYS_MPC85xx_CPM_ADDR +CPM_POST_WORD_ADDR );return *save_addr; }
Signature · 1 line
1.7.0.4
PATCH v3 4/7 Fix address for POST for 85xx with CPM
Quoted 7 lines · York Sun
The address used for
post_word_loadandpost_word_storeis in the dual port RAM for processors with CPM.Signed-off-by York Sun <[email protected]>---
arch/powerpc/cpu/mpc85xx/commproc.c| 8 ++++----1 files changed, 4 insertions(+), 4 deletions(-)
The following commit removes post_word_{load,store} from this file:
commit 800eb09641ae67c707b65acff112684a954b7f44
Author: Michael Zaidman <[email protected]> Date: Mon Sep 20 08:51:53 2010 +0200
POST cleanup.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.
So dropping this patch for now.
- k
PATCH v3 5/7 Setup POST word for generic mpc85xx
In reply to York SunUsing PIC TFRR register for post word load/store for generic MPC85xx.
--- arch/powerpc/cpu/mpc85xx/cpu.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu.c +19 -0
@@ -286,6 +286,25 @@ void mpc85xx_reginfo(void)print_lbc_regs (); } +#ifdef CONFIG_POST + +__attribute__((weak)) +void post_word_store (ulong a) +{ +void *save_addr = (void *) + (CONFIG_SYS_MPC8xxx_PIC_ADDR + offsetof(ccsr_pic_t , tfrr)); +out_be32 (save_addr, a); +} +__attribute__((weak)) +ulong post_word_load (void ) +{ +void *save_addr = (void *) + (CONFIG_SYS_MPC8xxx_PIC_ADDR + offsetof(ccsr_pic_t , tfrr)); +return in_be32 (save_addr); +} + +#endif /* CONFIG_POST */ +#if CONFIG_POST &CONFIG_SYS_POST_MEMORY /* Board-specific functions defined in each board's ddr.c */
Signature · 1 line
1.7.0.4
Kumar Gala
AppliedPATCH v3 5/7 Setup POST word for generic mpc85xx
Quoted 6 lines · York Sun
Using PIC TFRR register for post word load/store for generic MPC85xx.
Signed-off-by York Sun <[email protected]>---
arch/powerpc/cpu/mpc85xx/cpu.c| 19 +++++++++++++++++++1 files changed, 19 insertions(+), 0 deletions(-)
applied to 85xx
- k
PATCH v3 6/7 Enable POST memory test for corenet_ds
In reply to York Sun--- include/configs/corenet_ds.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/configs/corenet_ds.h +1 -0
@@ -86,6 +86,7 @@#define CONFIG_SYS_NUM_ADDR_MAP 64/* number of TLB1 entries */ #endif +#define CONFIG_POST CONFIG_SYS_POST_MEMORY/* test POST memory test */ #define CONFIG_SYS_MEMTEST_START 0x00200000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000#define CONFIG_SYS_ALT_MEMTEST
Signature · 1 line
1.7.0.4
PATCH v3 7/7 Enable POST memory test for P2020DS
In reply to York Sun--- include/configs/P2020DS.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
include/configs/P2020DS.h +3 -2
@@ -73,8 +73,9 @@#define CONFIG_SYS_NUM_ADDR_MAP 16/* number of TLB1 entries */ #endif -#define CONFIG_SYS_MEMTEST_START 0x00000000/* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x7fffffff +#define CONFIG_POST CONFIG_SYS_POST_MEMORY/* test POST memory test */ +#define CONFIG_SYS_MEMTEST_START 0x00200000/* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x00400000#define CONFIG_PANIC_HANG /* do not reset board on panic */ /*
Signature · 1 line
1.7.0.4
Wolfgang Denk
AppliedPATCH v3 1/7 Expand POST memory test to support arch-depended implementation.
In reply to York SunDear York Sun,
Quoted 9 lines · In message <[email protected]> you wrote:
Add weak functions to enable architecture depended preparation, address advancing, cleaning up and error handling.
These weak functions provides the framwork to implemente
arch/platformdependent code for initializing/maintenance/restore the start address, size, physical address as well as memory mapping before/between/after memory test.arch_memory_failure_handlecan also be implemented in case more care is needed forarch/platform.
Quoted 4 lines
Signed-off-by York Sun <[email protected]>--- post/drivers/memory.c | 68 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 52 insertions(+), 16 deletions(-)
Applied, thanks.
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
Let's say the docs present a simplified view of reality... :-)
- Larry Wall in <[email protected]>