Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d9eca5 authored by Hari Bathini's avatar Hari Bathini Committed by Michael Ellerman
Browse files

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



With commit 11550dc0 ("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: 11550dc0 ("powerpc/fadump: reuse crashkernel parameter for fadump memory reservation")
Suggested-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarHari Bathini <hbathini@linux.vnet.ibm.com>
[mpe: Unsplit long printk strings]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 98b8cd7f

arch/powerpc/kernel/fadump.c

+25 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ static inline unsigned long fadump_calculate_reserve_size(void) 
	int ret;

	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

	 * 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(),

				&size, &base);

	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;

		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 */
@@ -377,6 +389,19 @@ static int __init early_fadump_param(char *p) 
}

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)

{

	int rc, err;