From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ECE2C35242 for ; Fri, 24 Jan 2020 14:36:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA9D6206F0 for ; Fri, 24 Jan 2020 14:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876618; bh=KhVlt+qljKi5E9ciLNaFzqJlnZU1bRRfabfVh+WYVA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mfsAJuE7e/yWeKQhmI9ZIaB+m2QHsCXRu6bpSazkv73rUk1/Clfhwa9Lg0hroZEwq HnOXqpH1jfWs3CDVS5GF1ksr7/6iUI9ctr7Yd2kUERZ/nquRnj2+NeMacCKjltCwam dwRfEnY9j0xffm9g+SRkVDmJqTYuXmXbWSbirh9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403979AbgAXOTJ (ORCPT ); Fri, 24 Jan 2020 09:19:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:39072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403846AbgAXOTB (ORCPT ); Fri, 24 Jan 2020 09:19:01 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2AE1222527; Fri, 24 Jan 2020 14:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875540; bh=KhVlt+qljKi5E9ciLNaFzqJlnZU1bRRfabfVh+WYVA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1bIThUOE17ixH+9TFK8+PaswlkjY3c3oY7Ktmi3ZP/R/kLdUiVptT5m6MZqm8XB0i Sp1mEwITMNEM2yG1LoLonTta7R+XwVyLKHLEm7QiNW1X+ToyxwbomJ9a7+4KKowsCm VOrMHJ1Bkw78KqDrkAtPRxm3BKUWPK+PpeaMHhk8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philipp Rudo , Vasily Gorbik , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 037/107] s390/setup: Fix secure ipl message Date: Fri, 24 Jan 2020 09:17:07 -0500 Message-Id: <20200124141817.28793-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124141817.28793-1-sashal@kernel.org> References: <20200124141817.28793-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philipp Rudo [ Upstream commit 40260b01d029ba374637838213af500e03305326 ] 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: Sasha Levin --- arch/s390/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 3ff291bc63b7e..b95e6fa34cc8e 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"); -- 2.20.1