| Message ID | 20250121115442.1278458-3-sourabhjain@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/crash: use generic crashkernel reservation | expand |
On 21/01/25 5:24 pm, Sourabh Jain wrote: > cmdline argument is not used in reserve_crashkernel_generic() so remove > it. Correspondingly, all the callers have been updated as well. > > No functional change intended. > Looks good to me. Acked-by: Hari Bathini <hbathini@linux.ibm.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Hari Bathini <hbathini@linux.ibm.com> > Cc: Madhavan Srinivasan <maddy@linux.ibm.com> > Cc: Mahesh Salgaonkar <mahesh@linux.ibm.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: kexec@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Acked-by: Baoquan He <bhe@redhat.com> > Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com> > --- > arch/arm64/mm/init.c | 6 ++---- > arch/loongarch/kernel/setup.c | 5 ++--- > arch/riscv/mm/init.c | 6 ++---- > arch/x86/kernel/setup.c | 6 ++---- > include/linux/crash_reserve.h | 11 +++++------ > kernel/crash_reserve.c | 9 ++++----- > 6 files changed, 17 insertions(+), 26 deletions(-) > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index 9c0b8d9558fc..6c5a1ee4b5d3 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -98,21 +98,19 @@ static void __init arch_reserve_crashkernel(void) > { > unsigned long long low_size = 0; > unsigned long long crash_base, crash_size; > - char *cmdline = boot_command_line; > bool high = false; > int ret; > > if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) > return; > > - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), > + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), > &crash_size, &crash_base, > &low_size, &high); > if (ret) > return; > > - reserve_crashkernel_generic(cmdline, crash_size, crash_base, > - low_size, high); > + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); > } > > static phys_addr_t __init max_zone_phys(phys_addr_t zone_limit) > diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c > index 56934fe58170..ece9c4266c3f 100644 > --- a/arch/loongarch/kernel/setup.c > +++ b/arch/loongarch/kernel/setup.c > @@ -259,18 +259,17 @@ static void __init arch_reserve_crashkernel(void) > int ret; > unsigned long long low_size = 0; > unsigned long long crash_base, crash_size; > - char *cmdline = boot_command_line; > bool high = false; > > if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) > return; > > - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), > + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), > &crash_size, &crash_base, &low_size, &high); > if (ret) > return; > > - reserve_crashkernel_generic(cmdline, crash_size, crash_base, low_size, high); > + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); > } > > static void __init fdt_setup(void) > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 8d167e09f1fe..16b81beb41bf 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -1392,21 +1392,19 @@ static void __init arch_reserve_crashkernel(void) > { > unsigned long long low_size = 0; > unsigned long long crash_base, crash_size; > - char *cmdline = boot_command_line; > bool high = false; > int ret; > > if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) > return; > > - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), > + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), > &crash_size, &crash_base, > &low_size, &high); > if (ret) > return; > > - reserve_crashkernel_generic(cmdline, crash_size, crash_base, > - low_size, high); > + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); > } > > void __init paging_init(void) > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index f1fea506e20f..15b6823556c8 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -469,14 +469,13 @@ static void __init memblock_x86_reserve_range_setup_data(void) > static void __init arch_reserve_crashkernel(void) > { > unsigned long long crash_base, crash_size, low_size = 0; > - char *cmdline = boot_command_line; > bool high = false; > int ret; > > if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) > return; > > - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), > + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), > &crash_size, &crash_base, > &low_size, &high); > if (ret) > @@ -487,8 +486,7 @@ static void __init arch_reserve_crashkernel(void) > return; > } > > - reserve_crashkernel_generic(cmdline, crash_size, crash_base, > - low_size, high); > + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); > } > > static struct resource standard_io_resources[] = { > diff --git a/include/linux/crash_reserve.h b/include/linux/crash_reserve.h > index 5a9df944fb80..1fe7e7d1b214 100644 > --- a/include/linux/crash_reserve.h > +++ b/include/linux/crash_reserve.h > @@ -32,13 +32,12 @@ int __init parse_crashkernel(char *cmdline, unsigned long long system_ram, > #define CRASH_ADDR_HIGH_MAX memblock_end_of_DRAM() > #endif > > -void __init reserve_crashkernel_generic(char *cmdline, > - unsigned long long crash_size, > - unsigned long long crash_base, > - unsigned long long crash_low_size, > - bool high); > +void __init reserve_crashkernel_generic(unsigned long long crash_size, > + unsigned long long crash_base, > + unsigned long long crash_low_size, > + bool high); > #else > -static inline void __init reserve_crashkernel_generic(char *cmdline, > +static inline void __init reserve_crashkernel_generic( > unsigned long long crash_size, > unsigned long long crash_base, > unsigned long long crash_low_size, > diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c > index a620fb4b2116..aff7c0fdbefa 100644 > --- a/kernel/crash_reserve.c > +++ b/kernel/crash_reserve.c > @@ -375,11 +375,10 @@ static int __init reserve_crashkernel_low(unsigned long long low_size) > return 0; > } > > -void __init reserve_crashkernel_generic(char *cmdline, > - unsigned long long crash_size, > - unsigned long long crash_base, > - unsigned long long crash_low_size, > - bool high) > +void __init reserve_crashkernel_generic(unsigned long long crash_size, > + unsigned long long crash_base, > + unsigned long long crash_low_size, > + bool high) > { > unsigned long long search_end = CRASH_ADDR_LOW_MAX, search_base = 0; > bool fixed_base = false;
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 9c0b8d9558fc..6c5a1ee4b5d3 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -98,21 +98,19 @@ static void __init arch_reserve_crashkernel(void) { unsigned long long low_size = 0; unsigned long long crash_base, crash_size; - char *cmdline = boot_command_line; bool high = false; int ret; if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) return; - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base, &low_size, &high); if (ret) return; - reserve_crashkernel_generic(cmdline, crash_size, crash_base, - low_size, high); + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); } static phys_addr_t __init max_zone_phys(phys_addr_t zone_limit) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 56934fe58170..ece9c4266c3f 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -259,18 +259,17 @@ static void __init arch_reserve_crashkernel(void) int ret; unsigned long long low_size = 0; unsigned long long crash_base, crash_size; - char *cmdline = boot_command_line; bool high = false; if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) return; - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base, &low_size, &high); if (ret) return; - reserve_crashkernel_generic(cmdline, crash_size, crash_base, low_size, high); + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); } static void __init fdt_setup(void) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 8d167e09f1fe..16b81beb41bf 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1392,21 +1392,19 @@ static void __init arch_reserve_crashkernel(void) { unsigned long long low_size = 0; unsigned long long crash_base, crash_size; - char *cmdline = boot_command_line; bool high = false; int ret; if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) return; - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base, &low_size, &high); if (ret) return; - reserve_crashkernel_generic(cmdline, crash_size, crash_base, - low_size, high); + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); } void __init paging_init(void) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f1fea506e20f..15b6823556c8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -469,14 +469,13 @@ static void __init memblock_x86_reserve_range_setup_data(void) static void __init arch_reserve_crashkernel(void) { unsigned long long crash_base, crash_size, low_size = 0; - char *cmdline = boot_command_line; bool high = false; int ret; if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) return; - ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base, &low_size, &high); if (ret) @@ -487,8 +486,7 @@ static void __init arch_reserve_crashkernel(void) return; } - reserve_crashkernel_generic(cmdline, crash_size, crash_base, - low_size, high); + reserve_crashkernel_generic(crash_size, crash_base, low_size, high); } static struct resource standard_io_resources[] = { diff --git a/include/linux/crash_reserve.h b/include/linux/crash_reserve.h index 5a9df944fb80..1fe7e7d1b214 100644 --- a/include/linux/crash_reserve.h +++ b/include/linux/crash_reserve.h @@ -32,13 +32,12 @@ int __init parse_crashkernel(char *cmdline, unsigned long long system_ram, #define CRASH_ADDR_HIGH_MAX memblock_end_of_DRAM() #endif -void __init reserve_crashkernel_generic(char *cmdline, - unsigned long long crash_size, - unsigned long long crash_base, - unsigned long long crash_low_size, - bool high); +void __init reserve_crashkernel_generic(unsigned long long crash_size, + unsigned long long crash_base, + unsigned long long crash_low_size, + bool high); #else -static inline void __init reserve_crashkernel_generic(char *cmdline, +static inline void __init reserve_crashkernel_generic( unsigned long long crash_size, unsigned long long crash_base, unsigned long long crash_low_size, diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c index a620fb4b2116..aff7c0fdbefa 100644 --- a/kernel/crash_reserve.c +++ b/kernel/crash_reserve.c @@ -375,11 +375,10 @@ static int __init reserve_crashkernel_low(unsigned long long low_size) return 0; } -void __init reserve_crashkernel_generic(char *cmdline, - unsigned long long crash_size, - unsigned long long crash_base, - unsigned long long crash_low_size, - bool high) +void __init reserve_crashkernel_generic(unsigned long long crash_size, + unsigned long long crash_base, + unsigned long long crash_low_size, + bool high) { unsigned long long search_end = CRASH_ADDR_LOW_MAX, search_base = 0; bool fixed_base = false;