[PATCH] powerpc: Fixed memory reserve map layout

powerpc: Fixed memory reserve map layout

The memory reserve map is suppose to be a pair of 64-bit integers
to represent each region.  On ppc32 the code was treating the
pair as two 32-bit integers.  Additional the prom_init code was
producing the wrong layout on ppc32.

Added a simple check to try to provide backwards compatibility.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 34ab0daec3a7d795de54018975bb492f70917ecf..02e2115323e49b5f6d43fcd782cea4843c76527c 100644 (file)
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1100,17 +1100,37 @@ static int __init early_init_dt_scan_memory(unsigned long node,
 
 static void __init early_reserve_mem(void)
 {
-       unsigned long base, size;
-       unsigned long *reserve_map;
+       u64 base, size;
+       u64 *reserve_map;
 
-       reserve_map = (unsigned long *)(((unsigned long)initial_boot_params) +
+       reserve_map = (u64 *)(((unsigned long)initial_boot_params) +
                                        initial_boot_params->off_mem_rsvmap);
+#ifdef CONFIG_PPC32
+       /* 
+        * Handle the case where we might be booting from an old kexec
+        * image that setup the mem_rsvmap as pairs of 32-bit values
+        */
+       if (*reserve_map > 0xffffffffull) {
+               u32 base_32, size_32;
+               u32 *reserve_map_32 = (u32 *)reserve_map;
+
+               while (1) {
+                       base_32 = *(reserve_map_32++);
+                       size_32 = *(reserve_map_32++);
+                       if (size_32 == 0)
+                               break;
+                       DBG("reserving: %lx -> %lx\n", base_32, size_32);
+                       lmb_reserve(base_32, size_32);
+               }
+               return;
+       }
+#endif
        while (1) {
                base = *(reserve_map++);
                size = *(reserve_map++);
                if (size == 0)
                        break;
-               DBG("reserving: %lx -> %lx\n", base, size);
+               DBG("reserving: %llx -> %llx\n", base, size);
                lmb_reserve(base, size);
        }
 

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index e381f2fc121c5782d04b20a270503efded1d0b46..d963a12ec640007269d5be45a63a64a73f04cb1b 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -137,8 +137,8 @@ struct prom_t {
 };
 
 struct mem_map_entry {
-       unsigned long   base;
-       unsigned long   size;
+       u64     base;
+       u64     size;
 };
 
 typedef u32 cell_t;
@@ -897,9 +897,9 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp)
  * If problems seem to show up, it would be a good start to track
  * them down.
  */
-static void reserve_mem(unsigned long base, unsigned long size)
+static void reserve_mem(u64 base, u64 size)
 {
-       unsigned long top = base + size;
+       u64 top = base + size;
        unsigned long cnt = RELOC(mem_reserve_cnt);
 
        if (size == 0)