msm: automatically size unstable memory on 8960
On 8960, all memory banks except the lowest one
(where the kernel lives) are unstable (i.e. may
be powered off under DMM).
This patch temporarily hard codes the bank
size to 512M, a later patch will allow us to
obtain this from shared memory.
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 26234b9..f027e55 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -34,6 +34,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include <asm/setup.h>
#include <asm/hardware/gic.h>
#include <asm/mach/mmc.h>
@@ -717,26 +718,54 @@
#endif
}
+static int msm8960_paddr_to_memtype(unsigned int paddr)
+{
+ return MEMTYPE_EBI1;
+}
+
static void __init msm8960_calculate_reserve_sizes(void)
{
size_pmem_devices();
reserve_pmem_memory();
}
-static int msm8960_paddr_to_memtype(unsigned int paddr)
-{
- return MEMTYPE_EBI1;
-}
-
static struct reserve_info msm8960_reserve_info __initdata = {
.memtype_reserve_table = msm8960_reserve_table,
.calculate_reserve_sizes = msm8960_calculate_reserve_sizes,
.paddr_to_memtype = msm8960_paddr_to_memtype,
};
+static int msm8960_memory_bank_size(void)
+{
+ return 1<<29;
+}
+
+static void __init locate_unstable_memory(void)
+{
+ struct membank *mb = &meminfo.bank[meminfo.nr_banks - 1];
+ unsigned long bank_size;
+ unsigned long low, high;
+
+ bank_size = msm8960_memory_bank_size();
+ low = meminfo.bank[0].start;
+ high = mb->start + mb->size;
+ low &= ~(bank_size - 1);
+
+ if (high - low <= bank_size)
+ return;
+ msm8960_reserve_info.low_unstable_address = low + bank_size;
+ msm8960_reserve_info.max_unstable_size = high - low - bank_size;
+ msm8960_reserve_info.bank_size = bank_size;
+ pr_info("low unstable address %lx max size %lx bank size %lx\n",
+ msm8960_reserve_info.low_unstable_address,
+ msm8960_reserve_info.max_unstable_size,
+ msm8960_reserve_info.bank_size);
+}
+
static void __init msm8960_reserve(void)
{
reserve_info = &msm8960_reserve_info;
+ locate_unstable_memory();
msm_reserve();
}