powerpc/mpc85xx: Fix DDR TLB mapping leftover
PATCH v3 1/1 powerpc/mpc85xx: Fix DDR TLB mapping leftover
Commit f29f804a93e87c17670607641d120f431a3b0633 generalized the TLB mapping function, but made the DDR mapping leftover size to zero, causing the message not printed.
Signed-off-by York Sun <[email protected]>
CC Alexander Graf <[email protected]>
CC Scott Wood <[email protected]>
---
Change log
v3: Add checking for memsize > CONFIG_MAX_MEM_MAPPED for print_size
v2: Fix unnecessary parentheses
arch/powerpc/cpu/mpc85xx/tlb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc85xx/tlb.c +8 -4
@@ -299,12 +299,16 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr, {unsigned int ram_tlb_address = (unsigned int )CONFIG_SYS_DDR_SDRAM_BASE ;u64 memsize = (u64 )memsize_in_meg <<20 ; +u64 size; - memsize =min (memsize, (u64 )CONFIG_MAX_MEM_MAPPED ); - memsize =tlb_map_range (ram_tlb_address, p_addr, memsize,TLB_MAP_RAM ); + size =min (memsize, (u64 )CONFIG_MAX_MEM_MAPPED ); + size =tlb_map_range (ram_tlb_address, p_addr, size,TLB_MAP_RAM ); -if (memsize) -print_size (memsize," left unmapped\n" ); +if (size || memsize >CONFIG_MAX_MEM_MAPPED ) { +print_size (memsize >CONFIG_MAX_MEM_MAPPED ? + memsize -CONFIG_MAX_MEM_MAPPED + size : size, +" left unmapped\n" ); + }return memsize_in_meg; }
Signature · 1 line
1.7.9.5
PATCH v3 1/1 powerpc/mpc85xx: Fix DDR TLB mapping leftover
Quoted 4 lines · York Sun
Commit
f29f804a93e87c17670607641d120f431a3b0633generalized the TLB mapping function, but made the DDR mapping leftover size to zero, causing the message not printed.
Quoted 8 lines
Signed-off-by York Sun <[email protected]>CC Alexander Graf <[email protected]>CC Scott Wood <[email protected]>---
Change log
v3: Add checking for memsize >CONFIG_MAX_MEM_MAPPEDforprint_size
v2: Fix unnecessary parentheses
Applied to u-boot-mpc85xx master, awaiting upstream.
York