openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/fadump: Add a warning when 'fadump_reserve_mem=' is used 

With commit 11550dc0a0 ("powerpc/fadump: reuse crashkernel parameter
for fadump memory reservation"), 'fadump_reserve_mem=' parameter is
deprecated in favor of 'crashkernel=' parameter. Add a warning if
'fadump_reserve_mem=' is still used.

Fixes: 11550dc0a0 ("powerpc/fadump: reuse crashkernel parameter for fadump memory reservation")
Suggested-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
[mpe: Unsplit long printk strings]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Hari Bathini 2017-05-22 15:04:23 +05:30 committed by Michael Ellerman
parent 98b8cd7f75
commit 81d9eca502
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/powerpc/kernel/fadump.c
View File

@ -212,6 +212,9 @@ static inline unsigned long fadump_calculate_reserve_size(void)
int ret; int ret;
unsigned long long base, size; unsigned long long base, size;
if (fw_dump.reserve_bootvar)
pr_warn("'fadump_reserve_mem=' parameter is deprecated in favor of 'crashkernel=' parameter.\n");
/* /*
* Check if the size is specified through crashkernel= cmdline * Check if the size is specified through crashkernel= cmdline
* option. If yes, then use that but ignore base as fadump * option. If yes, then use that but ignore base as fadump
@ -220,8 +223,17 @@ static inline unsigned long fadump_calculate_reserve_size(void)
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
&size, &base); &size, &base);
if (ret == 0 && size > 0) { if (ret == 0 && size > 0) {
if (fw_dump.reserve_bootvar)
pr_info("Using 'crashkernel=' parameter for memory reservation.\n");
fw_dump.reserve_bootvar = (unsigned long)size; fw_dump.reserve_bootvar = (unsigned long)size;
return fw_dump.reserve_bootvar; return fw_dump.reserve_bootvar;
} else if (fw_dump.reserve_bootvar) {
/*
* 'fadump_reserve_mem=' is being used to reserve memory
* for firmware-assisted dump.
*/
return fw_dump.reserve_bootvar;
} }
/* divide by 20 to get 5% of value */ /* divide by 20 to get 5% of value */
@ -377,6 +389,19 @@ static int __init early_fadump_param(char *p)
} }
early_param("fadump", early_fadump_param); early_param("fadump", early_fadump_param);
/*
* Look for fadump_reserve_mem= cmdline option
* TODO: Remove references to 'fadump_reserve_mem=' parameter,
* the sooner 'crashkernel=' parameter is accustomed to.
*/
static int __init early_fadump_reserve_mem(char *p)
{
if (p)
fw_dump.reserve_bootvar = memparse(p, &p);
return 0;
}
early_param("fadump_reserve_mem", early_fadump_reserve_mem);
static int register_fw_dump(struct fadump_mem_struct *fdm) static int register_fw_dump(struct fadump_mem_struct *fdm)
{ {
int rc, err; int rc, err;