Skip to content

Commit dcf639f

Browse files
author
Michal Simek
committed
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 <[email protected]> Signed-off-by: Shubhrajyoti Datta <[email protected]>
1 parent bb6d3fb commit dcf639f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/microblaze/kernel/setup.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ void __init setup_arch(char **cmdline_p)
5454
*cmdline_p = boot_command_line;
5555

5656
setup_memory();
57-
parse_early_param();
5857

5958
console_verbose();
6059

arch/microblaze/mm/init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,8 @@ asmlinkage void __init mmu_init(void)
347347
* inside 768MB limit */
348348
memblock_set_current_limit(memory_start + lowmem_size - 1);
349349

350+
parse_early_param();
351+
350352
/* CMA initialization */
351353
dma_contiguous_reserve(memory_start + lowmem_size - 1);
352354
}

0 commit comments

Comments
 (0)