msm: Only use platform data for cache dumping size
Trustzone provides an SCM call to determine the size of the L1
and L2 buffers required for cache dumping. This size of memory
must be pre-reserved early in bootup. The point at time at which
the memory must be reserved is too early to make SCM calls, however.
The buffer sizes are known at bootup and are not likely to change
so just pass the sizes given in platform data.
Change-Id: I8c03b03eaa2095ab9654b0e697dac469df2d9370
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 9860f7c..629e48e 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -701,31 +701,11 @@
static void __init reserve_cache_dump_memory(void)
{
#ifdef CONFIG_MSM_CACHE_DUMP
- unsigned int spare;
- unsigned int l1_size;
- unsigned int l2_size;
unsigned int total;
- int ret;
- ret = scm_call(L1C_SERVICE_ID, L1C_BUFFER_GET_SIZE_COMMAND_ID, &spare,
- sizeof(spare), &l1_size, sizeof(l1_size));
-
- if (ret)
- /* Fall back to something reasonable here */
- l1_size = L1_BUFFER_SIZE;
-
- ret = scm_call(L1C_SERVICE_ID, L2C_BUFFER_GET_SIZE_COMMAND_ID, &spare,
- sizeof(spare), &l2_size, sizeof(l2_size));
-
- if (ret)
- /* Fall back to something reasonable here */
- l2_size = L2_BUFFER_SIZE;
-
- total = l1_size + l2_size;
-
+ total = msm8960_cache_dump_pdata.l1_size +
+ msm8960_cache_dump_pdata.l2_size;
msm8960_reserve_table[MEMTYPE_EBI1].size += total;
- msm8960_cache_dump_pdata.l1_size = l1_size;
- msm8960_cache_dump_pdata.l2_size = l2_size;
#endif
}