Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / powerpc / cpu / mpc85xx / tlb.c

diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 4adba95aaf804995cf6ed6a81b67e5534f1e2cd7..4465ae7565a45be93f4f0d55a0fbf00d5e455311 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -1,19 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <asm/bitops.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
 #endif
 
+#include <linux/log2.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 void invalidate_tlb(u8 tlb)
@@ -299,12 +301,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;
 }