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>

diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 4adba95aaf804995cf6ed6a81b67e5534f1e2cd7..8e0508f3625aa9eb4b8163ab8fade7b487a534dd 100644 (file)
--- 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;
 }