The following commit has been merged into the ras/core branch of tip: Commit-ID: bb2de0adca217a114ce023489426e24152e4bfcf Gitweb: https://git.kernel.org/tip/bb2de0adca217a114ce023489426e24152e4bfcf Author: Smita Koralahalli <smita.koralahallichannabasa...@amd.com> AuthorDate: Tue, 23 Jun 2020 08:00:59 -05:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Tue, 23 Jun 2020 17:27:53 +02:00
x86/mce, EDAC/mce_amd: Print PPIN in machine check records Print the Protected Processor Identification Number (PPIN) on processors which support it. [ bp: Massage. ] Signed-off-by: Smita Koralahalli <smita.koralahallichannabasa...@amd.com> Signed-off-by: Borislav Petkov <b...@suse.de> Link: https://lkml.kernel.org/r/20200623130059.8870-1-smita.koralahallichannabasa...@amd.com --- arch/x86/kernel/cpu/mce/core.c | 2 ++ drivers/edac/mce_amd.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index ce9120c..0865349 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -244,6 +244,8 @@ static void __print_mce(struct mce *m) pr_cont("ADDR %llx ", m->addr); if (m->misc) pr_cont("MISC %llx ", m->misc); + if (m->ppin) + pr_cont("PPIN %llx ", m->ppin); if (mce_flags.smca) { if (m->synd) diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c index 2b5401d..325aedf 100644 --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -1094,6 +1094,9 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) if (m->status & MCI_STATUS_ADDRV) pr_emerg(HW_ERR "Error Addr: 0x%016llx\n", m->addr); + if (m->ppin) + pr_emerg(HW_ERR "PPIN: 0x%016llx\n", m->ppin); + if (boot_cpu_has(X86_FEATURE_SMCA)) { pr_emerg(HW_ERR "IPID: 0x%016llx", m->ipid);
