Skip to content

Commit 565f9bc

Browse files
hramrachmpe
authored andcommitted
powerpc/fadump: when fadump is supported register the fadump sysfs files.
Currently it is not possible to distinguish the case when fadump is supported by firmware and disabled in kernel and completely unsupported using the kernel sysfs interface. User can investigate the devicetree but it is more reasonable to provide sysfs files in case we get some fadumpv2 in the future. With this patch sysfs files are available whenever fadump is supported by firmware. There is duplicate message about lack of support by firmware in fadump_reserve_mem and setup_fadump. Remove the duplicate message in setup_fadump. Signed-off-by: Michal Suchanek <msuchanek@suse.de> Reviewed-by: Hari Bathini <hbathini@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20191107164757.15140-1-msuchanek@suse.de
1 parent 42484d2 commit 565f9bc

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

arch/powerpc/kernel/fadump.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,16 +1466,15 @@ static void fadump_init_files(void)
14661466
*/
14671467
int __init setup_fadump(void)
14681468
{
1469-
if (!fw_dump.fadump_enabled)
1470-
return 0;
1471-
1472-
if (!fw_dump.fadump_supported) {
1473-
printk(KERN_ERR "Firmware-assisted dump is not supported on"
1474-
" this hardware\n");
1469+
if (!fw_dump.fadump_supported)
14751470
return 0;
1476-
}
14771471

1472+
fadump_init_files();
14781473
fadump_show_config();
1474+
1475+
if (!fw_dump.fadump_enabled)
1476+
return 1;
1477+
14791478
/*
14801479
* If dump data is available then see if it is valid and prepare for
14811480
* saving it to the disk.
@@ -1492,8 +1491,6 @@ int __init setup_fadump(void)
14921491
else if (fw_dump.reserve_dump_area_size)
14931492
fw_dump.ops->fadump_init_mem_struct(&fw_dump);
14941493

1495-
fadump_init_files();
1496-
14971494
return 1;
14981495
}
14991496
subsys_initcall(setup_fadump);

0 commit comments

Comments
 (0)