mirror of
https://github.com/torvalds/linux
synced 2024-10-15 15:59:15 +00:00
crash_core: change the prototype of function parse_crashkernel()
Add two parameters 'low_size' and 'high' to function parse_crashkernel(), later crashkernel=,high|low parsing will be added. Make adjustments in all call sites of parse_crashkernel() in arch. Link: https://lkml.kernel.org/r/20230914033142.676708-3-bhe@redhat.com Signed-off-by: Baoquan He <bhe@redhat.com> Reviewed-by: Zhen Lei <thunder.leizhen@huawei.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chen Jiahao <chenjiahao16@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
a6304272b0
commit
a9e1a3d84e
|
@ -1010,7 +1010,8 @@ static void __init reserve_crashkernel(void)
|
||||||
|
|
||||||
total_mem = get_total_mem();
|
total_mem = get_total_mem();
|
||||||
ret = parse_crashkernel(boot_command_line, total_mem,
|
ret = parse_crashkernel(boot_command_line, total_mem,
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base,
|
||||||
|
NULL, NULL);
|
||||||
/* invalid value specified or crashkernel=0 */
|
/* invalid value specified or crashkernel=0 */
|
||||||
if (ret || !crash_size)
|
if (ret || !crash_size)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -142,7 +142,7 @@ static void __init reserve_crashkernel(void)
|
||||||
|
|
||||||
/* crashkernel=X[@offset] */
|
/* crashkernel=X[@offset] */
|
||||||
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
|
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
if (ret == -ENOENT) {
|
if (ret == -ENOENT) {
|
||||||
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
|
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
|
||||||
if (ret || !crash_size)
|
if (ret || !crash_size)
|
||||||
|
|
|
@ -277,7 +277,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = parse_crashkernel(boot_command_line, total,
|
ret = parse_crashkernel(boot_command_line, total,
|
||||||
&size, &base);
|
&size, &base, NULL, NULL);
|
||||||
if (ret == 0 && size > 0) {
|
if (ret == 0 && size > 0) {
|
||||||
if (!base) {
|
if (!base) {
|
||||||
sort_regions(rsvd_region, *n);
|
sort_regions(rsvd_region, *n);
|
||||||
|
|
|
@ -267,7 +267,9 @@ static void __init arch_parse_crashkernel(void)
|
||||||
unsigned long long crash_base, crash_size;
|
unsigned long long crash_base, crash_size;
|
||||||
|
|
||||||
total_mem = memblock_phys_mem_size();
|
total_mem = memblock_phys_mem_size();
|
||||||
ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
|
ret = parse_crashkernel(boot_command_line, total_mem,
|
||||||
|
&crash_size, &crash_base,
|
||||||
|
NULL, NULL);
|
||||||
if (ret < 0 || crash_size <= 0)
|
if (ret < 0 || crash_size <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -460,7 +460,8 @@ static void __init mips_parse_crashkernel(void)
|
||||||
|
|
||||||
total_mem = memblock_phys_mem_size();
|
total_mem = memblock_phys_mem_size();
|
||||||
ret = parse_crashkernel(boot_command_line, total_mem,
|
ret = parse_crashkernel(boot_command_line, total_mem,
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base,
|
||||||
|
NULL, NULL);
|
||||||
if (ret != 0 || crash_size <= 0)
|
if (ret != 0 || crash_size <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -313,7 +313,7 @@ static __init u64 fadump_calculate_reserve_size(void)
|
||||||
* memory at a predefined offset.
|
* memory at a predefined offset.
|
||||||
*/
|
*/
|
||||||
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
||||||
&size, &base);
|
&size, &base, NULL, NULL);
|
||||||
if (ret == 0 && size > 0) {
|
if (ret == 0 && size > 0) {
|
||||||
unsigned long max_size;
|
unsigned long max_size;
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ void __init reserve_crashkernel(void)
|
||||||
total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
|
total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
|
||||||
/* use common parsing */
|
/* use common parsing */
|
||||||
ret = parse_crashkernel(boot_command_line, total_mem_sz,
|
ret = parse_crashkernel(boot_command_line, total_mem_sz,
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
if (ret == 0 && crash_size > 0) {
|
if (ret == 0 && crash_size > 0) {
|
||||||
crashk_res.start = crash_base;
|
crashk_res.start = crash_base;
|
||||||
crashk_res.end = crash_base + crash_size - 1;
|
crashk_res.end = crash_base + crash_size - 1;
|
||||||
|
|
|
@ -178,7 +178,7 @@ static void __init get_crash_kernel(void *fdt, unsigned long size)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = parse_crashkernel(boot_command_line, size, &crash_size,
|
ret = parse_crashkernel(boot_command_line, size, &crash_size,
|
||||||
&crash_base);
|
&crash_base, NULL, NULL);
|
||||||
if (ret != 0 || crash_size == 0)
|
if (ret != 0 || crash_size == 0)
|
||||||
return;
|
return;
|
||||||
if (crash_base == 0)
|
if (crash_base == 0)
|
||||||
|
|
|
@ -1388,7 +1388,7 @@ static void __init reserve_crashkernel(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
|
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
if (ret == -ENOENT) {
|
if (ret == -ENOENT) {
|
||||||
/* Fallback to crashkernel=X,[high,low] */
|
/* Fallback to crashkernel=X,[high,low] */
|
||||||
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
|
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
|
||||||
|
|
|
@ -625,8 +625,8 @@ static void __init reserve_crashkernel(void)
|
||||||
phys_addr_t low, high;
|
phys_addr_t low, high;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = parse_crashkernel(boot_command_line, ident_map_size, &crash_size,
|
rc = parse_crashkernel(boot_command_line, ident_map_size,
|
||||||
&crash_base);
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
|
|
||||||
crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
|
crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
|
||||||
crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);
|
crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);
|
||||||
|
|
|
@ -154,7 +154,7 @@ void __init reserve_crashkernel(void)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
||||||
&crash_size, &crash_base);
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
if (ret == 0 && crash_size > 0) {
|
if (ret == 0 && crash_size > 0) {
|
||||||
crashk_res.start = crash_base;
|
crashk_res.start = crash_base;
|
||||||
crashk_res.end = crash_base + crash_size - 1;
|
crashk_res.end = crash_base + crash_size - 1;
|
||||||
|
|
|
@ -553,7 +553,8 @@ static void __init reserve_crashkernel(void)
|
||||||
total_mem = memblock_phys_mem_size();
|
total_mem = memblock_phys_mem_size();
|
||||||
|
|
||||||
/* crashkernel=XM */
|
/* crashkernel=XM */
|
||||||
ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
|
ret = parse_crashkernel(boot_command_line, total_mem,
|
||||||
|
&crash_size, &crash_base, NULL, NULL);
|
||||||
if (ret != 0 || crash_size <= 0) {
|
if (ret != 0 || crash_size <= 0) {
|
||||||
/* crashkernel=X,high */
|
/* crashkernel=X,high */
|
||||||
ret = parse_crashkernel_high(boot_command_line, total_mem,
|
ret = parse_crashkernel_high(boot_command_line, total_mem,
|
||||||
|
|
|
@ -80,7 +80,8 @@ Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
|
||||||
void final_note(Elf_Word *buf);
|
void final_note(Elf_Word *buf);
|
||||||
|
|
||||||
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
|
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
|
||||||
unsigned long long *crash_size, unsigned long long *crash_base);
|
unsigned long long *crash_size, unsigned long long *crash_base,
|
||||||
|
unsigned long long *low_size, bool *high);
|
||||||
int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
|
int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
|
||||||
unsigned long long *crash_size, unsigned long long *crash_base);
|
unsigned long long *crash_size, unsigned long long *crash_base);
|
||||||
int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
|
int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
|
||||||
|
|
|
@ -287,10 +287,19 @@ static int __init __parse_crashkernel(char *cmdline,
|
||||||
int __init parse_crashkernel(char *cmdline,
|
int __init parse_crashkernel(char *cmdline,
|
||||||
unsigned long long system_ram,
|
unsigned long long system_ram,
|
||||||
unsigned long long *crash_size,
|
unsigned long long *crash_size,
|
||||||
unsigned long long *crash_base)
|
unsigned long long *crash_base,
|
||||||
|
unsigned long long *low_size,
|
||||||
|
bool *high)
|
||||||
{
|
{
|
||||||
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
|
int ret;
|
||||||
NULL);
|
|
||||||
|
/* crashkernel=X[@offset] */
|
||||||
|
ret = __parse_crashkernel(cmdline, system_ram, crash_size,
|
||||||
|
crash_base, NULL);
|
||||||
|
if (!high)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init parse_crashkernel_high(char *cmdline,
|
int __init parse_crashkernel_high(char *cmdline,
|
||||||
|
|
Loading…
Reference in a new issue