[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <167023540385.4906.769505168034496699.tip-bot2@tip-bot2>
Date: Mon, 05 Dec 2022 10:16:43 -0000
From: "tip-bot2 for Juergen Gross" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Juergen Gross <jgross@...e.com>,
"Borislav Petkov (AMD)" <bp@...en8.de>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/cpu] x86/mtrr: Make message for disabled MTRRs more descriptive
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 <jgross@...e.com>
AuthorDate: Mon, 05 Dec 2022 09:04:33 +01:00
Committer: Borislav Petkov (AMD) <bp@...en8.de>
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 <jgross@...e.com>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
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);
}
/**
Powered by blists - more mailing lists