| From ef73eba6ca4e02c06b6bc05fe8a9b8ee229cebb2 Mon Sep 17 00:00:00 2001 |
| From: Philipp Rudo <prudo@linux.ibm.com> |
| Date: Wed, 18 Dec 2019 11:24:43 +0100 |
| Subject: [PATCH] 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 <prudo@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c |
| index f8544d517430..10557bfc2cfb 100644 |
| --- a/arch/s390/kernel/setup.c |
| +++ b/arch/s390/kernel/setup.c |
| @@ -1066,7 +1066,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"); |
| -- |
| 2.7.4 |
| |
