Commit ab1b55e2 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

[PATCH] powerpc: incorrect rmo_top handling in prom_init

On Thu, 2006-03-02 at 19:55 +0100, Olaf Hering wrote:

> My iBook1 has 2 memory regions in reg. Depending on how I boot it
> (vmlinux+initrd) or zImage.initrd, it will not boot with current Linus
> tree.
> rmo_top should be 160MB instead of 32MB.

On logically-partitioned machines the first element of the reg
property in the memory node is defined to be the "RMO" region,
i.e. the memory that the processor can access in real mode.  On other
machines the first element has no special meaning, so only take it to
be the RMO region on LPAR machines.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 141aa59b
...@@ -978,7 +978,7 @@ static void __init prom_init_mem(void) ...@@ -978,7 +978,7 @@ static void __init prom_init_mem(void)
if (size == 0) if (size == 0)
continue; continue;
prom_debug(" %x %x\n", base, size); prom_debug(" %x %x\n", base, size);
if (base == 0) if (base == 0 && (RELOC(of_platform) & PLATFORM_LPAR))
RELOC(rmo_top) = size; RELOC(rmo_top) = size;
if ((base + size) > RELOC(ram_top)) if ((base + size) > RELOC(ram_top))
RELOC(ram_top) = base + size; RELOC(ram_top) = base + size;
......
Markdown is supported
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