From patchwork Mon Dec 5 10:16:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 29630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2166834wrr; Mon, 5 Dec 2022 02:25:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf6hXluFj7g2gOtvt7eu/wmaO/2z8tESi4DcJwCzeEsH5/KeJyzOu+RW9GfXKWaQeYkKo3aV X-Received: by 2002:a05:6402:3810:b0:467:42a9:3568 with SMTP id es16-20020a056402381000b0046742a93568mr71618018edb.70.1670235907808; Mon, 05 Dec 2022 02:25:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670235907; cv=none; d=google.com; s=arc-20160816; b=K2qENiJQ+uSzAooNL5pAKx1cYchqFmuT2DUZv7shlGiAczg/tHmgj9Xu1xh1vU8/mG XfD0KfMHgG7QnDB1jdVpi0CtNSgiyGNt8Q+JfLqwWIslqHOvq2wIjTMvV+J5e0gDBcZa jAIQoX5chafvCVRP4TC1dxbmfdg99JYqOx1x7LbzO9IpDmB5l6Q3GAb+sAeuoduWn1ov Klm3hxSOnkFLtFnqu1U0s7XymwjphnuuTaYGtCpzLYdX4ln1ozqmaLAMYtpafSdLxWqB og3mCSQXBD3GHa43B667nZAy8RQFWD4l9pk89buB2ht5YtrzO83y/jRusrHKCFJcaFGs pdnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=eUABA7cTiUpkbff/4pIrajUwqXIfq2KxpOg7kH+gkCM=; b=D0xdms5HkoowifGJpvhQtoLTjv/tHt8Ux4iQA2MlJTZra9e7q54AWNPKYV6sAd6Zoa qD44vzhS+G4b9GfarxJzStodq6ILVq2jR/T+uyiNcLpO7hiGhfZTcN60ajqrn0Nd14UZ UXg+wqr9Egpeqz9MibtSJ+29O6kFB1/zRfASZEHsnjK5X7+CmL6Vzlg0nkIb2emEpDkd gJSFp0xtVL/m0z3KvxHFoy6B1nVT0EpFe22DNSjyaD9hwA8jro+SAimrHkcHgUK+iS6k TDv28P+s+HpkZVWIIwWd/KmvGDx+yMubuDnB2Kz/py0LyQJPWtvEsFL536QShzyCeAuE Tz6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="YV7MIHP/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qa31-20020a170907869f00b007ae9abf1994si13807337ejc.837.2022.12.05.02.24.44; Mon, 05 Dec 2022 02:25:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="YV7MIHP/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230246AbiLEKQy (ORCPT + 99 others); Mon, 5 Dec 2022 05:16:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230184AbiLEKQr (ORCPT ); Mon, 5 Dec 2022 05:16:47 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB1FE18E24; Mon, 5 Dec 2022 02:16:46 -0800 (PST) Date: Mon, 05 Dec 2022 10:16:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670235404; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eUABA7cTiUpkbff/4pIrajUwqXIfq2KxpOg7kH+gkCM=; b=YV7MIHP/p2gLYRD+BaTkP3eGWZLoNbImnTocOj5NUeaydwQWffx7hg+2GG/tTu9jdi3cVy lMEgciIVCX9dqsSVdoZsKOSjwCTIjlIcaoAD0KU/2JRW26AuYTszvN61dLydAGJtYF/GwF Jn1Bdjfl+Nt506/2IZ6c7F3ghNk39c0oYIMSvIRc2y7g6C640Zct4wvyZwt+c59JaJAuHD MTgH028yhvcLyb9XbVfYsIflireK3sFauk9qyq5lQ5OeFNrvzkGxb53YzJIWOGnhO8nWPw XirCBIW+or3vugc5XQWoJ4cKKpWRooojHX2Giim3M/vOhvtVzpvmg6Dl42/c1Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670235404; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eUABA7cTiUpkbff/4pIrajUwqXIfq2KxpOg7kH+gkCM=; b=xPN4u2F+74gXC9suJ9NrdnnYe/zgRlB6WASedm8E9/SqQ1t2xD4aiCXhLvvGQAiCrEpcXG eNcQCGZbof+2s9DA== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/mtrr: Make message for disabled MTRRs more descriptive Cc: Juergen Gross , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221205080433.16643-3-jgross@suse.com> References: <20221205080433.16643-3-jgross@suse.com> MIME-Version: 1.0 Message-ID: <167023540385.4906.769505168034496699.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751369287532845633?= X-GMAIL-MSGID: =?utf-8?q?1751369287532845633?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 7882b69eb6cdf6288a89d831d95c8547400a8b4d Gitweb: https://git.kernel.org/tip/7882b69eb6cdf6288a89d831d95c8547400a8b4d Author: Juergen Gross AuthorDate: Mon, 05 Dec 2022 09:04:33 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 05 Dec 2022 11:08:25 +01:00 x86/mtrr: Make message for disabled MTRRs more descriptive Instead of just saying "Disabled" when MTRRs are disabled for any reason, tell what is disabled and why. Signed-off-by: Juergen Gross Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20221205080433.16643-3-jgross@suse.com --- arch/x86/kernel/cpu/mtrr/mtrr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c index 6432abc..783f321 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.c +++ b/arch/x86/kernel/cpu/mtrr/mtrr.c @@ -629,6 +629,7 @@ int __initdata changed_by_mtrr_cleanup; */ void __init mtrr_bp_init(void) { + const char *why = "(not available)"; u32 phys_addr; phys_addr = 32; @@ -705,12 +706,13 @@ void __init mtrr_bp_init(void) changed_by_mtrr_cleanup = mtrr_cleanup(phys_addr); } else { mtrr_if = NULL; + why = "by BIOS"; } } } if (!mtrr_enabled()) - pr_info("Disabled\n"); + pr_info("MTRRs disabled %s\n", why); } /**