Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...

[pandora-kernel.git] / arch / powerpc / kernel / prom.c

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 5f5e6ae..f2c906b 100644 (file)
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -68,6 +68,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)
 {
@@ -277,6 +278,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
        int i, nthreads;
        unsigned long len;
        int found = -1;
+       int found_thread = 0;
 
        /* We are scanning "cpu" nodes only */
        if (type == NULL || strcmp(type, "cpu") != 0)
@@ -300,9 +302,11 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                 * version 2 of the kexec param format adds the phys cpuid of
                 * booted proc.
                 */
-               if (initial_boot_params && initial_boot_params->version >= 2) {
-                       if (intserv[i] == initial_boot_params->boot_cpuid_phys)
+               if (initial_boot_params->version >= 2) {
+                       if (intserv[i] == initial_boot_params->boot_cpuid_phys) {
                                found = boot_cpu_count;
+                               found_thread = i;
+                       }
                } else {
                        /*
                         * Check if it's the boot-cpu, set it's hw index now,
@@ -321,9 +325,9 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 
        if (found >= 0) {
                DBG("boot cpu: logical %d physical %d\n", found,
-                       intserv[i]);
+                       intserv[found_thread]);
                boot_cpuid = found;
-               set_hard_smp_processor_id(found, intserv[i]);
+               set_hard_smp_processor_id(found, intserv[found_thread]);
 
                /*
                 * PAPR defines "logical" PVR values for cpus that
@@ -505,11 +509,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);
@@ -687,13 +694,14 @@ void __init early_init_devtree(void *params)
         * device-tree, including the platform type, initrd location and
         * size, TCE reserve, and more ...
         */
-       of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL);
+       of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);
 
        /* Scan memory nodes and rebuild MEMBLOCKs */
        memblock_init();
 
        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);