Commit dcf639fe authored Jan 14, 2020 by Michal Simek

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>

parent bb6d3fb3

arch/microblaze/kernel/setup.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ void __init setup_arch(char **cmdline_p)
		*cmdline_p = boot_command_line;

		setup_memory();
		parse_early_param();

		console_verbose();

arch/microblaze/mm/init.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message