diff options
| author | York Sun <yorksun@freescale.com> | 2014-12-02 11:21:09 -0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2014-12-15 09:15:40 -0800 |
| commit | 0ccee4e6277b4324785e91b488b19f7f30303e32 (patch) | |
| tree | bc9d7e7f24fe6c03b9ad6cbc78fb83fda508ab57 /arch/powerpc/cpu/mpc85xx | |
| parent | 938bbb6013f051808c08204184e94d0cdcb6dbff (diff) | |
| download | talos-obmc-uboot-0ccee4e6277b4324785e91b488b19f7f30303e32.tar.gz talos-obmc-uboot-0ccee4e6277b4324785e91b488b19f7f30303e32.zip | |
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 <yorksun@freescale.com>
CC: Alexander Graf <agraf@suse.de>
CC: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/tlb.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 4adba95aaf..8e0508f362 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -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; } |
