[XenPPC] [xenppc-unstable] [XEN][POWERPC] Fix systemsim-gpul failure to boot

[Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 878ce1f78ad3976f44a657e5386a7f6d619ffac2
# Parent  7669fca80bfc42aae163b38d4a17cea729c21cf7
[XEN][POWERPC] Fix systemsim-gpul failure to boot

This patch fixes the fencepost error and adds a check for the failure to
initialize the allocator, which would have make Mark's FTB much easier
to debug.

This works for me on the public systemsim-gpul release.
Signed-off-by: Amos Waterland <apw@xxxxxxxxxx>

Also fixes Maple, was just getting luck.

Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
---
 xen/arch/powerpc/boot_of.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 7669fca80bfc -r 878ce1f78ad3 xen/arch/powerpc/boot_of.c
--- a/xen/arch/powerpc/boot_of.c        Mon Dec 04 11:46:53 2006 -0500
+++ b/xen/arch/powerpc/boot_of.c        Mon Dec 11 19:43:18 2006 -0500
@@ -608,7 +608,7 @@ static ulong boot_of_mem_init(void)
                 if (size_cells == 2 && (r < l) )
                     size = (size << 32) | reg[r++];
                 
-                if (r >= l)
+                if (r > l)
                     break;  /* partial line.  Skip */
 
                 boot_of_alloc_init(p, addr_cells, size_cells);
@@ -1290,6 +1290,7 @@ multiboot_info_t __init *boot_of_init(
 {
     static multiboot_info_t mbi;
     void *oft;
+    int r;
 
     of_vec = vec;
     of_msr = orig_msr;
@@ -1316,7 +1317,9 @@ multiboot_info_t __init *boot_of_init(
     of_printf("%s: _start %p _end %p 0x%lx\n", __func__, _start, _end, r6);
 
     boot_of_fix_maple();
-    boot_of_mem_init();
+    r = boot_of_mem_init();
+    if (r == 0)
+        of_panic("failure to initialize memory allocator");
     boot_of_bootargs(&mbi);
     oft = boot_of_module(r3, r4, &mbi);
     boot_of_cpus();

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel