UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Force memory size to be a multiple of PAGE_SIZE 

Ensure that total memory size is page-aligned, because otherwise
mark_bootmem() gets upset.

This error case was triggered by using 64 KiB pages in the kernel
while arch/powerpc/boot/4xx.c arbitrarily reduced the amount of memory
by 4096 (to work around a chip bug that affects the last 256 bytes of
physical memory).

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Hollis Blanchard 2008-11-26 10:19:26 -06:00 committed by Paul Mackerras
parent f8f50b1bdd
commit 6ca4f7494b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/kernel/prom.c
View File

@ -1160,6 +1160,8 @@ static inline void __init phyp_dump_reserve_mem(void) {}
void __init early_init_devtree(void *params) void __init early_init_devtree(void *params)
{ {
unsigned long limit;
DBG(" -> early_init_devtree(%p)\n", params); DBG(" -> early_init_devtree(%p)\n", params);
/* Setup flat device-tree pointer */ /* Setup flat device-tree pointer */
@ -1200,7 +1202,19 @@ void __init early_init_devtree(void *params)
early_reserve_mem(); early_reserve_mem();
phyp_dump_reserve_mem(); phyp_dump_reserve_mem();
lmb_enforce_memory_limit(memory_limit); limit = memory_limit;
if (! limit) {
unsigned long memsize;
/* Ensure that total memory size is page-aligned, because
* otherwise mark_bootmem() gets upset. */
lmb_analyze();
memsize = lmb_phys_mem_size();
if ((memsize & PAGE_MASK) != memsize)
limit = memsize & PAGE_MASK;
}
lmb_enforce_memory_limit(limit);
lmb_analyze(); lmb_analyze();
DBG("Phys. mem: %lx\n", lmb_phys_mem_size()); DBG("Phys. mem: %lx\n", lmb_phys_mem_size());