[PATCH u-boot-mvebu 1/3] arm: mvebu: a37xx: Fix calling build_mem_map()
Pali Rohár
pali at kernel.org
Tue Feb 15 00:28:33 CET 2022
Function build_mem_map() modifies global variable mem_map. This variable is
used by the get_page_table_size() function which is called by function
arm_reserve_mmu() (as aliased macro PGTABLE_SIZE). Function
arm_reserve_mmu() is called earlier than enable_caches() which calls
build_mem_map(). So arm_reserve_mmu() does not calculate reserved memory
correctly.
Fix this issue by calling build_mem_map() from a3700_dram_init() which is
called before arm_reserve_mmu().
Signed-off-by: Pali Rohár <pali at kernel.org>
---
arch/arm/mach-mvebu/armada3700/cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index bdf8dc377528..9da0d08f947c 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -136,8 +136,6 @@ static void build_mem_map(void)
void enable_caches(void)
{
- build_mem_map();
-
icache_enable();
dcache_enable();
}
@@ -146,6 +144,8 @@ int a3700_dram_init(void)
{
int win;
+ build_mem_map();
+
gd->ram_size = 0;
for (win = 0; win < MVEBU_CPU_DEC_WINS; ++win) {
u32 base, tgt, size;
--
2.20.1
More information about the U-Boot
mailing list