microblaze: Kernel parameters should be parsed earlier

Kernel command line should be parsed before cma initialization to be able
to get cma sizes from command line. That's why call parse_early_param()
before dma_continugous_reserve().

Unfortunately it can't be called earlier in machine_early_init() because
if earlycon is passed in the command line the parse_early_param() attempts
an ioremap which fails as the memory params are not set yet.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 511c1ab7f57f573cbae6bac9978df3a112d1b7b8..a8fc15ac4291f8b8722c4d66f57907f1b0edab06 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -54,7 +54,6 @@ void __init setup_arch(char **cmdline_p)
        *cmdline_p = boot_command_line;
 
        setup_memory();
-       parse_early_param();
 
        console_verbose();
 

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 1056f1674065f98f66560acfa1045f9f89a4b23c..9899ff2ef9b6bd96cffd0733e3b6ba812761816e 100644 (file)
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -347,6 +347,8 @@ asmlinkage void __init mmu_init(void)
         * inside 768MB limit */
        memblock_set_current_limit(memory_start + lowmem_size - 1);
 
+       parse_early_param();
+
        /* CMA initialization */
        dma_contiguous_reserve(memory_start + lowmem_size - 1);
 }