From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752257AbdFNJY5 (ORCPT ); Wed, 14 Jun 2017 05:24:57 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54607 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223AbdFNJYy (ORCPT ); Wed, 14 Jun 2017 05:24:54 -0400 Date: Wed, 14 Jun 2017 02:20:14 -0700 From: tip-bot for Yazen Ghannam Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, yazen.ghannam@amd.com, linux-edac@vger.kernel.org, hpa@zytor.com, bp@alien8.de, tony.luck@intel.com, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, bp@suse.de Reply-To: torvalds@linux-foundation.org, bp@suse.de, mingo@kernel.org, peterz@infradead.org, bp@alien8.de, tony.luck@intel.com, hpa@zytor.com, linux-edac@vger.kernel.org, yazen.ghannam@amd.com, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20170613162835.30750-9-bp@alien8.de> References: <20170613162835.30750-9-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Update bootlog description to reflect behavior on AMD Git-Commit-ID: 6057077f6ebc0747c2f5b21dfb1eb782f489d0f6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6057077f6ebc0747c2f5b21dfb1eb782f489d0f6 Gitweb: http://git.kernel.org/tip/6057077f6ebc0747c2f5b21dfb1eb782f489d0f6 Author: Yazen Ghannam AuthorDate: Tue, 13 Jun 2017 18:28:35 +0200 Committer: Ingo Molnar CommitDate: Wed, 14 Jun 2017 07:32:10 +0200 x86/mce: Update bootlog description to reflect behavior on AMD The bootlog option is only disabled by default on AMD Fam10h and older systems. Update bootlog description to say this. Change the family value to hex to avoid confusion. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Link: http://lkml.kernel.org/r/20170613162835.30750-9-bp@alien8.de Signed-off-by: Ingo Molnar --- Documentation/x86/x86_64/boot-options.txt | 3 ++- arch/x86/kernel/cpu/mcheck/mce.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 61b611e..b297c48 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -36,7 +36,8 @@ Machine check to broadcast MCEs. mce=bootlog Enable logging of machine checks left over from booting. - Disabled by default on AMD because some BIOS leave bogus ones. + Disabled by default on AMD Fam10h and older because some BIOS + leave bogus ones. If your BIOS doesn't do that it's a good idea to enable though to make sure you log even machine check events that result in a reboot. On Intel systems it is enabled by default. diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 3c54c2b..b58b778 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1550,7 +1550,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) */ clear_bit(10, (unsigned long *)&mce_banks[4].ctl); } - if (c->x86 < 17 && cfg->bootlog < 0) { + if (c->x86 < 0x11 && cfg->bootlog < 0) { /* * Lots of broken BIOS around that don't clear them * by default and leave crap in there. Don't log: @@ -1832,7 +1832,8 @@ void mce_disable_bank(int bank) * mce=TOLERANCELEVEL[,monarchtimeout] (number, see above) * monarchtimeout is how long to wait for other CPUs on machine * check, or 0 to not wait - * mce=bootlog Log MCEs from before booting. Disabled by default on AMD. + * mce=bootlog Log MCEs from before booting. Disabled by default on AMD Fam10h + and older. * mce=nobootlog Don't log MCEs from before booting. * mce=bios_cmci_threshold Don't program the CMCI threshold * mce=recovery force enable memcpy_mcsafe()