Commit 873553b3 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Kumar Gala
Browse files

[POWERPC] 85xx: Failure with odd memory sizes and CONFIG_HIGHMEM



The CONFIG_FSL_BOOKE mmu setup code fails when CONFIG_HIGHMEM=y
and the 3 fixed TLB entries cannot exactly map the lowmem size.
Each TLB entry can map 4MB, 16MB, 64MB or 256MB, so the failure
is observed when the kernel lowmem size is not equal to the
sum of up to 3 of those values.

Normally, memory is sized in nice numbers, but I observed this
problem while testing a crash dump kernel.  The failure can
also be observed by artificially reducing the kernel's main
memory via the mem= kernel command line parameter.

This commit fixes the problem by setting __initial_memory_limit
in adjust_total_lowmem().

Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 0e65bfe3
...@@ -59,6 +59,7 @@ unsigned int num_tlbcam_entries; ...@@ -59,6 +59,7 @@ unsigned int num_tlbcam_entries;
static unsigned long __cam0, __cam1, __cam2; static unsigned long __cam0, __cam1, __cam2;
extern unsigned long total_lowmem; extern unsigned long total_lowmem;
extern unsigned long __max_low_memory; extern unsigned long __max_low_memory;
extern unsigned long __initial_memory_limit;
#define MAX_LOW_MEM CONFIG_LOWMEM_SIZE #define MAX_LOW_MEM CONFIG_LOWMEM_SIZE
#define NUM_TLBCAMS (16) #define NUM_TLBCAMS (16)
...@@ -232,4 +233,5 @@ adjust_total_lowmem(void) ...@@ -232,4 +233,5 @@ adjust_total_lowmem(void)
__cam0 >> 20, __cam1 >> 20, __cam2 >> 20, __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
(total_lowmem - __cam0 - __cam1 - __cam2) >> 20); (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
__max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2; __max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2;
__initial_memory_limit = __max_low_memory;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment