diff options
| author | Sumit Singh <sumsingh@nvidia.com> | 2014-01-31 19:38:07 +0530 |
|---|---|---|
| committer | Sachin Nikam <snikam@nvidia.com> | 2014-02-09 23:10:40 -0800 |
| commit | bcb186075677a767c07a89b3bde1f34cc0d788ee (patch) | |
| tree | c7d0ab847f1139aa01b9eac9f4de54e14fca5ac5 /arch/arm/mach-tegra/common.c | |
| parent | 0e3353ed7e38bb5348a332cf0aac91ab31afcd06 (diff) | |
ARM: tegra: reserve PSTORE memory
Configure to reserve memory for PSTORE ftrace and console
as 1MB each.
Bug 1449479
Change-Id: I5392d3f1aee81aa02c09108a562085278d5ad39b
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/362430
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index b69f447f26b0..2d6aec01e18a 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -114,6 +114,11 @@ #define ADDR_BNDRY(x) (((x) & 0xf) << 21) #define INACTIVITY_TIMEOUT(x) (((x) & 0xffff) << 0) +#ifdef CONFIG_PSTORE_RAM +#define RAMOOPS_MEM_SIZE SZ_2M +#define FTRACE_MEM_SIZE SZ_1M +#endif + phys_addr_t tegra_bootloader_fb_start; phys_addr_t tegra_bootloader_fb_size; phys_addr_t tegra_bootloader_fb2_start; @@ -1840,7 +1845,8 @@ static void __init tegra_reserve_ramoops_memory(unsigned long reserve_size) { ramoops_data.mem_size = reserve_size; ramoops_data.mem_address = memblock_end_of_4G() - reserve_size; - ramoops_data.console_size = reserve_size; + ramoops_data.console_size = reserve_size - FTRACE_MEM_SIZE; + ramoops_data.ftrace_size = FTRACE_MEM_SIZE; ramoops_data.dump_oops = 1; memblock_reserve(ramoops_data.mem_address, ramoops_data.mem_size); } @@ -2149,7 +2155,7 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size, tegra_fb_linear_set(map); #ifdef CONFIG_PSTORE_RAM - tegra_reserve_ramoops_memory(SZ_1M); + tegra_reserve_ramoops_memory(RAMOOPS_MEM_SIZE); #endif } |