[PATCH] powerpc: Make early memory scan more resilient to out of order nodes

We keep track of the size of the lowest block of memory and call
setup_initial_memory_limit() only after we've parsed them all

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/kernel/prom.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 584b398..27475c6 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c

@@ -70,6 +70,7 @@ int __initdata iommu_force_on;
 unsigned long tce_alloc_start, tce_alloc_end;
 u64 ppc64_rma_size;
 #endif
+static phys_addr_t first_memblock_size;
 
 static int __init early_parse_mem(char *p)
 {

@@ -507,11 +508,14 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 			size = 0x80000000ul - base;
 	}
 #endif
-
-	/* First MEMBLOCK added, do some special initializations */
-	if (memstart_addr == ~(phys_addr_t)0)
-		setup_initial_memory_limit(base, size);
-	memstart_addr = min((u64)memstart_addr, base);
+	/* Keep track of the beginning of memory -and- the size of
+	 * the very first block in the device-tree as it represents
+	 * the RMA on ppc64 server
+	 */
+	if (base < memstart_addr) {
+		memstart_addr = base;
+		first_memblock_size = size;
+	}
 
 	/* Add the chunk to the MEMBLOCK list */
 	memblock_add(base, size);

@@ -708,6 +712,7 @@ void __init early_init_devtree(void *params)
 
 	of_scan_flat_dt(early_init_dt_scan_root, NULL);
 	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);
+	setup_initial_memory_limit(memstart_addr, first_memblock_size);
 
 	/* Save command line for /proc/cmdline and then parse parameters */
 	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);

On Wed, 11 May 2011 about 20:58:18 -0000, Benjamin Herrenschmidt wrote:

We keep track of the size of the lowest block of memory and call
setup_initial_memory_limit() only after we've parsed them all

Good, we lose our sensitivity to device node ordering.

__initdata 

(its only referenced by 2 __init functions)

Acked-by: Milton Miller <redacted>

 static int __init early_parse_mem(char *p)
 {

..

..

On Thu, 2011-05-12 at 03:09 -0500, Milton Miller wrote:

On Wed, 11 May 2011 about 20:58:18 -0000, Benjamin Herrenschmidt wrote:

quoted

We keep track of the size of the lowest block of memory and call
setup_initial_memory_limit() only after we've parsed them all

Good, we lose our sensitivity to device node ordering.

Yup, A platform we'll release soon has all of them backward :-)

quoted

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c

quoted

index 584b398..27475c6 100644

--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c

@@ -70,6 +70,7 @@ int __initdata iommu_force_on;
 unsigned long tce_alloc_start, tce_alloc_end;
 u64 ppc64_rma_size;
 #endif
+static phys_addr_t first_memblock_size;

__initdata 

(its only referenced by 2 __init functions)

Acked-by: Milton Miller <redacted>

Ag good, I'll fold that in, thanks.

Cheers,
Ben.

quoted

 static int __init early_parse_mem(char *p)
 {

..

quoted

@@ -507,11 +508,14 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)

..

quoted

@@ -708,6 +712,7 @@ void __init early_init_devtree(void *params)