diff options
| author |   Michal Simek <michal.simek@xilinx.com> | 2020-01-14 11:00:41 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-02-24 12:19:42 +0100 |
| commit | dcf639fe6f801f6418357ec20376b2218f666f44 (patch) | |
| tree | c989bfab192e50d2e650b50a59e1af523f2fbb1a /arch/microblaze | |
| parent | Linux 5.6-rc1 (diff) | |
| download | linux-dev-dcf639fe6f801f6418357ec20376b2218f666f44.tar.xz linux-dev-dcf639fe6f801f6418357ec20376b2218f666f44.zip | |
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>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/microblaze/mm/init.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 511c1ab7f57f..a8fc15ac4291 100644 --- 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 1056f1674065..9899ff2ef9b6 100644 --- 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); } |