projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()
[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 129ec662fe8a84ba289bb914cddd296eb8e08967..cf31eb2ef3a61a05b29d4a1ea9d5971144684355 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/
arch/powerpc/cpu/mpc85xx/tlb.c
@@
-14,6
+14,8
@@
#include <addr_map.h>
#endif
#include <addr_map.h>
#endif
+#include <linux/log2.h>
+
DECLARE_GLOBAL_DATA_PTR;
void invalidate_tlb(u8 tlb)
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;
{
unsigned int ram_tlb_address = (unsigned int)CONFIG_SYS_DDR_SDRAM_BASE;
u64 memsize = (u64)memsize_in_meg << 20;
+ u64 size;
-
memsize = min(memsize,
CONFIG_MAX_MEM_MAPPED);
-
memsize = tlb_map_range(ram_tlb_address, p_addr, mem
size, 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;
}
return memsize_in_meg;
}