From: Philipp Rudo Date: Wed, 18 Dec 2019 10:24:43 +0000 (+0100) Subject: s390/setup: Fix secure ipl message X-Git-Tag: v5.4.14~152 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c68777df519635bb1d4053253bc6832ede17f3e6;p=platform%2Fkernel%2Flinux-rpi.git s390/setup: Fix secure ipl message commit 40260b01d029ba374637838213af500e03305326 upstream. The new machine loader on z15 always creates an IPL Report block and thus sets the IPL_PL_FLAG_IPLSR even when secure boot is disabled. This causes the wrong message being printed at boot. Fix this by checking for IPL_PL_FLAG_SIPL instead. Fixes: 9641b8cc733f ("s390/ipl: read IPL report at early boot") Signed-off-by: Philipp Rudo Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 3ff291b..b95e6fa 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -1059,7 +1059,7 @@ static void __init log_component_list(void) if (!early_ipl_comp_list_addr) return; - if (ipl_block.hdr.flags & IPL_PL_FLAG_IPLSR) + if (ipl_block.hdr.flags & IPL_PL_FLAG_SIPL) pr_info("Linux is running with Secure-IPL enabled\n"); else pr_info("Linux is running with Secure-IPL disabled\n");