msm: 8960: Track all reservations for memory map
Generate memory map for each reservations for 8960,
8930 and 8064.
Change-Id: I9d5bc8174160ffa410062282f76b15b671219576
Signed-off-by: Chitti Babu Theegala <ctheegal@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064-display.c b/arch/arm/mach-msm/board-8064-display.c
index e98784f..24f8f9f 100644
--- a/arch/arm/mach-msm/board-8064-display.c
+++ b/arch/arm/mach-msm/board-8064-display.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -269,6 +269,9 @@
mdp_pdata.ov0_wb_size;
reserve_table[mdp_pdata.mem_hid].size +=
mdp_pdata.ov1_wb_size;
+
+ pr_info("mem_map: mdp reserved with size 0x%lx in pool\n",
+ mdp_pdata.ov0_wb_size + mdp_pdata.ov1_wb_size);
#endif
}
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 9c0513f..879fb9f 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -245,6 +245,8 @@
{
#if defined(CONFIG_MSM_RTB)
apq8064_reserve_table[MEMTYPE_EBI1].size += apq8064_rtb_pdata.size;
+ pr_info("mem_map: rtb reserved with size 0x%x in pool\n",
+ apq8064_rtb_pdata.size);
#endif
}
@@ -278,6 +280,8 @@
reserve_memory_for(&android_pmem_audio_pdata);
#endif /*CONFIG_MSM_MULTIMEDIA_USE_ION*/
apq8064_reserve_table[MEMTYPE_EBI1].size += msm_contig_mem_size;
+ pr_info("mem_map: contig_mem reserved with size 0x%x in pool\n",
+ msm_contig_mem_size);
#endif /*CONFIG_ANDROID_PMEM*/
}
@@ -466,6 +470,9 @@
ret = memblock_remove(reserve_info->fixed_area_start,
reserve_info->fixed_area_size);
+ pr_info("mem_map: fixed_area reserved at 0x%lx with size 0x%lx\n",
+ reserve_info->fixed_area_start,
+ reserve_info->fixed_area_size);
BUG_ON(ret);
#endif
}
@@ -579,6 +586,9 @@
BUG_ON(!IS_ALIGNED(fixed_low_size + HOLE_SIZE, SECTION_SIZE));
ret = memblock_remove(fixed_low_start,
fixed_low_size + HOLE_SIZE);
+ pr_info("mem_map: fixed_low_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_low_start,
+ fixed_low_size + HOLE_SIZE);
BUG_ON(ret);
}
@@ -589,6 +599,9 @@
} else {
BUG_ON(!IS_ALIGNED(fixed_middle_size, SECTION_SIZE));
ret = memblock_remove(fixed_middle_start, fixed_middle_size);
+ pr_info("mem_map: fixed_middle_area reserved at 0x%lx with \
+ size 0x%x\n", fixed_middle_start,
+ fixed_middle_size);
BUG_ON(ret);
}
@@ -600,6 +613,9 @@
/* This is the end of the fixed area so it's okay to round up */
fixed_high_size = ALIGN(fixed_high_size, SECTION_SIZE);
ret = memblock_remove(fixed_high_start, fixed_high_size);
+ pr_info("mem_map: fixed_high_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_high_start,
+ fixed_high_size);
BUG_ON(ret);
}
@@ -667,6 +683,8 @@
total = apq8064_cache_dump_pdata.l1_size +
apq8064_cache_dump_pdata.l2_size;
apq8064_reserve_table[MEMTYPE_EBI1].size += total;
+ pr_info("mem_map: cache_dump reserved with size 0x%x in pool\n",
+ total);
#endif
}
diff --git a/arch/arm/mach-msm/board-8930-display.c b/arch/arm/mach-msm/board-8930-display.c
index d48c20a..b312c80 100644
--- a/arch/arm/mach-msm/board-8930-display.c
+++ b/arch/arm/mach-msm/board-8930-display.c
@@ -484,6 +484,9 @@
mdp_pdata.ov0_wb_size;
reserve_table[mdp_pdata.mem_hid].size +=
mdp_pdata.ov1_wb_size;
+
+ pr_info("mem_map: mdp reserved with size 0x%lx in pool\n",
+ mdp_pdata.ov0_wb_size + mdp_pdata.ov1_wb_size);
#endif
}
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index f983b88..bf0d30d 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -297,6 +297,8 @@
{
#if defined(CONFIG_MSM_RTB)
msm8930_reserve_table[MEMTYPE_EBI1].size += msm8930_rtb_pdata.size;
+ pr_info("mem_map: rtb reserved with size 0x%x in pool\n",
+ msm8930_rtb_pdata.size);
#endif
}
@@ -329,6 +331,8 @@
reserve_memory_for(&android_pmem_audio_pdata);
#endif /*CONFIG_MSM_MULTIMEDIA_USE_ION*/
msm8930_reserve_table[MEMTYPE_EBI1].size += msm_contig_mem_size;
+ pr_info("mem_map: contig_mem reserved with size 0x%x in pool\n",
+ msm_contig_mem_size);
#endif /*CONFIG_ANDROID_PMEM*/
}
@@ -518,6 +522,9 @@
ret = memblock_remove(reserve_info->fixed_area_start,
reserve_info->fixed_area_size);
+ pr_info("mem_map: fixed_area reserved at 0x%lx with size 0x%lx\n",
+ reserve_info->fixed_area_start,
+ reserve_info->fixed_area_size);
BUG_ON(ret);
#endif
}
@@ -628,6 +635,9 @@
BUG_ON(!IS_ALIGNED(fixed_low_size + HOLE_SIZE, SECTION_SIZE));
ret = memblock_remove(fixed_low_start,
fixed_low_size + HOLE_SIZE);
+ pr_info("mem_map: fixed_low_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_low_start,
+ fixed_low_size + HOLE_SIZE);
BUG_ON(ret);
}
@@ -638,6 +648,9 @@
} else {
BUG_ON(!IS_ALIGNED(fixed_middle_size, SECTION_SIZE));
ret = memblock_remove(fixed_middle_start, fixed_middle_size);
+ pr_info("mem_map: fixed_middle_area reserved at 0x%lx with \
+ size 0x%x\n", fixed_middle_start,
+ fixed_middle_size);
BUG_ON(ret);
}
@@ -649,6 +662,9 @@
/* This is the end of the fixed area so it's okay to round up */
fixed_high_size = ALIGN(fixed_high_size, SECTION_SIZE);
ret = memblock_remove(fixed_high_start, fixed_high_size);
+ pr_info("mem_map: fixed_high_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_high_start,
+ fixed_high_size);
BUG_ON(ret);
}
@@ -714,6 +730,8 @@
total = msm8930_cache_dump_pdata.l1_size +
msm8930_cache_dump_pdata.l2_size;
msm8930_reserve_table[MEMTYPE_EBI1].size += total;
+ pr_info("mem_map: cache_dump reserved with size 0x%x in pool\n",
+ total);
}
#else
static void __init reserve_cache_dump_memory(void) { }
diff --git a/arch/arm/mach-msm/board-8960-display.c b/arch/arm/mach-msm/board-8960-display.c
index ada557d..80173fe 100644
--- a/arch/arm/mach-msm/board-8960-display.c
+++ b/arch/arm/mach-msm/board-8960-display.c
@@ -603,6 +603,9 @@
mdp_pdata.ov0_wb_size;
reserve_table[mdp_pdata.mem_hid].size +=
mdp_pdata.ov1_wb_size;
+
+ pr_info("mem_map: mdp reserved with size 0x%lx in pool\n",
+ mdp_pdata.ov0_wb_size + mdp_pdata.ov1_wb_size);
#endif
}
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index f598637..c017be9 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -305,6 +305,8 @@
{
#if defined(CONFIG_MSM_RTB)
msm8960_reserve_table[MEMTYPE_EBI1].size += msm8960_rtb_pdata.size;
+ pr_info("mem_map: rtb reserved with size 0x%x in pool\n",
+ msm8960_rtb_pdata.size);
#endif
}
@@ -345,6 +347,8 @@
reserve_memory_for(&android_pmem_audio_pdata);
#endif
msm8960_reserve_table[MEMTYPE_EBI1].size += msm_contig_mem_size;
+ pr_info("mem_map: contig_mem reserved with size 0x%x in pool\n",
+ msm_contig_mem_size);
#endif
}
@@ -563,6 +567,9 @@
ret = memblock_remove(reserve_info->fixed_area_start,
reserve_info->fixed_area_size);
+ pr_info("mem_map: fixed_area reserved at 0x%lx with size 0x%lx\n",
+ reserve_info->fixed_area_start,
+ reserve_info->fixed_area_size);
BUG_ON(ret);
#endif
}
@@ -692,6 +699,9 @@
BUG_ON(!IS_ALIGNED(fixed_low_size + HOLE_SIZE, SECTION_SIZE));
ret = memblock_remove(fixed_low_start,
fixed_low_size + HOLE_SIZE);
+ pr_info("mem_map: fixed_low_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_low_start,
+ fixed_low_size + HOLE_SIZE);
BUG_ON(ret);
}
@@ -702,6 +712,9 @@
} else {
BUG_ON(!IS_ALIGNED(fixed_middle_size, SECTION_SIZE));
ret = memblock_remove(fixed_middle_start, fixed_middle_size);
+ pr_info("mem_map: fixed_middle_area reserved at 0x%lx with \
+ size 0x%x\n", fixed_middle_start,
+ fixed_middle_size);
BUG_ON(ret);
}
@@ -713,6 +726,9 @@
/* This is the end of the fixed area so it's okay to round up */
fixed_high_size = ALIGN(fixed_high_size, SECTION_SIZE);
ret = memblock_remove(fixed_high_start, fixed_high_size);
+ pr_info("mem_map: fixed_high_area reserved at 0x%lx with size \
+ 0x%x\n", fixed_high_start,
+ fixed_high_size);
BUG_ON(ret);
}
@@ -782,6 +798,8 @@
total = msm8960_cache_dump_pdata.l1_size +
msm8960_cache_dump_pdata.l2_size;
msm8960_reserve_table[MEMTYPE_EBI1].size += total;
+ pr_info("mem_map: cache_dump reserved with size 0x%x in pool\n",
+ total);
#endif
}