| Message ID | 20191023175651.24833-1-msuchanek@suse.de (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | powerpc/fadump: Remove duplicate message. | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (6b450d0404ca83dc131dadffd40c5aa6f7a603af) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
Michal, thanks for looking into this. On 23/10/19 11:26 PM, Michal Suchanek wrote: > There is duplicate message about lack of support by firmware in > fadump_reserve_mem and setup_fadump. Due to different capitalization it > is clear that the one in setup_fadump is shown on boot. Remove the > duplicate that is not shown. Actually, the message in fadump_reserve_mem() is logged. fadump_reserve_mem() executes first and sets fw_dump.fadump_enabled to `0`, if fadump is not supported. So, the other message in setup_fadump() doesn't get logged anymore with recent changes. The right thing to do would be to remove similar message in setup_fadump() instead. - Hari
On Thu, Oct 24, 2019 at 04:08:08PM +0530, Hari Bathini wrote: > > Michal, thanks for looking into this. > > On 23/10/19 11:26 PM, Michal Suchanek wrote: > > There is duplicate message about lack of support by firmware in > > fadump_reserve_mem and setup_fadump. Due to different capitalization it > > is clear that the one in setup_fadump is shown on boot. Remove the > > duplicate that is not shown. > > Actually, the message in fadump_reserve_mem() is logged. fadump_reserve_mem() > executes first and sets fw_dump.fadump_enabled to `0`, if fadump is not supported. > So, the other message in setup_fadump() doesn't get logged anymore with recent > changes. The right thing to do would be to remove similar message in setup_fadump() instead. I need to re-check with a recent kernel build. I saw the message from setup_fadump and not the one from fadump_reserve_mem but not sure what the platform init code looked like in the kernel I tested with. Thanks Michal
On Thu, Oct 24, 2019 at 01:16:51PM +0200, Michal Suchánek wrote: > On Thu, Oct 24, 2019 at 04:08:08PM +0530, Hari Bathini wrote: > > > > Michal, thanks for looking into this. > > > > On 23/10/19 11:26 PM, Michal Suchanek wrote: > > > There is duplicate message about lack of support by firmware in > > > fadump_reserve_mem and setup_fadump. Due to different capitalization it > > > is clear that the one in setup_fadump is shown on boot. Remove the > > > duplicate that is not shown. > > > > Actually, the message in fadump_reserve_mem() is logged. fadump_reserve_mem() > > executes first and sets fw_dump.fadump_enabled to `0`, if fadump is not supported. > > So, the other message in setup_fadump() doesn't get logged anymore with recent > > changes. The right thing to do would be to remove similar message in setup_fadump() instead. > > I need to re-check with a recent kernel build. I saw the message from > setup_fadump and not the one from fadump_reserve_mem but not sure what > the platform init code looked like in the kernel I tested with. Indeed, I was missing the patch that changes the capitalization in fadump_reserve_mem. In my kernel both messages are the same and the one from fadump_reserve_mem is displayed. Thanks Michal
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index cdcdea6c6453..f40dc713f089 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -438,10 +438,8 @@ int __init fadump_reserve_mem(void) if (!fw_dump.fadump_enabled) return 0; - if (!fw_dump.fadump_supported) { - pr_info("Firmware-Assisted Dump is not supported on this hardware\n"); + if (!fw_dump.fadump_supported) goto error_out; - } /* * Initialize boot memory size
There is duplicate message about lack of support by firmware in fadump_reserve_mem and setup_fadump. Due to different capitalization it is clear that the one in setup_fadump is shown on boot. Remove the duplicate that is not shown. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- arch/powerpc/kernel/fadump.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)