msm: improve handling of DONT_MAP_HOLE_AFTER_MEMBANK0
The code to avoid mapping the hole after memory bank 0
located the start and size of this hole after running
generic initialization code which needed to convert
physical addresses to virtual ones and vice-versa
beyond this hole.
While this didn't prevent the kernel from booting, this
isn't clean, and in fact it was giving us more vmalloc
space than the config file specified (and as a result
there was less lowmem than expected).
The code to locate the hole now runs before this
initialization code.
Change-Id: Id67d8b9ea489b6d6a2c20151b0fc9a9d7b5b662d
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index da31deb..b3b2b52 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -350,23 +350,31 @@
EXPORT_SYMBOL(membank0_size);
unsigned long membank1_start;
EXPORT_SYMBOL(membank1_start);
+
+void __init find_membank0_hole(void)
+{
+ sort(&meminfo.bank, meminfo.nr_banks,
+ sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
+
+ membank0_size = meminfo.bank[0].size;
+ membank1_start = meminfo.bank[1].start;
+
+ pr_info("m0 size %lx m1 start %lx\n", membank0_size, membank1_start);
+}
#endif
void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
{
int i;
+#ifndef CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0
sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
+#endif
memblock_init();
for (i = 0; i < mi->nr_banks; i++)
memblock_add(mi->bank[i].start, mi->bank[i].size);
-#ifdef CONFIG_DONT_MAP_HOLE_AFTER_MEMBANK0
- membank0_size = meminfo.bank[0].size;
- membank1_start = meminfo.bank[1].start;
-#endif
-
/* Register the kernel text, kernel data and initrd with memblock. */
#ifdef CONFIG_XIP_KERNEL
memblock_reserve(__pa(_sdata), _end - _sdata);