Re: [PATCH v7 5/5] EDAC/mce_amd: Add support for FRU Text in MCA
From: Borislav Petkov <bp@alien8.de>
Date: 2024-10-30 16:06:00
Also in:
linux-edac, lkml
Subsystem:
edac-amd64, edac-core, the rest, x86 architecture (32-bit and 64-bit), x86 mce infrastructure · Maintainers:
Yazen Ghannam, Borislav Petkov, Tony Luck, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Dave Hansen
On Tue, Oct 22, 2024 at 07:36:31PM +0000, Avadhut Naik wrote:
quoted hunk ↗ jump to hunk
@@ -853,8 +850,18 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) if (m->status & MCI_STATUS_SYNDV) { pr_cont(", Syndrome: 0x%016llx\n", m->synd); - pr_emerg(HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx", - err->vendor.amd.synd1, err->vendor.amd.synd2); + if (mca_config & MCI_CONFIG_FRUTEXT) { + char frutext[17]; + + frutext[16] = '\0'; + memcpy(&frutext[0], &err->vendor.amd.synd1, 8); + memcpy(&frutext[8], &err->vendor.amd.synd2, 8); + + pr_emerg(HW_ERR "FRU Text: %s", frutext); + } else { + pr_emerg(HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx", + err->vendor.amd.synd1, err->vendor.amd.synd2); + } }
Right, so let's turn this into:
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index bc5e67306f77..edc2c8033de8 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c@@ -208,8 +208,6 @@ static void __print_mce(struct mce_hw_err *err) pr_cont("SYND2 %llx ", err->vendor.amd.synd2); if (m->ipid) pr_cont("IPID %llx ", m->ipid); - if (err->vendor.amd.config) - pr_cont("CONFIG %llx ", err->vendor.amd.config); } pr_cont("\n");
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index d69a1466f0bc..62fcd92bf9d2 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c@@ -858,9 +858,6 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) memcpy(&frutext[8], &err->vendor.amd.synd2, 8); pr_emerg(HW_ERR "FRU Text: %s", frutext); - } else { - pr_emerg(HW_ERR "Syndrome1: 0x%016llx, Syndrome2: 0x%016llx", - err->vendor.amd.synd1, err->vendor.amd.synd2); } }
and simply treat synd1 and synd2 as FRU text. I don't want to expose
mca_config to userspace yet but use it in the RAS code only. If a case appears
that we want to really expose it to userspace, we can talk about a proper
design then.
This patch doesn't make it part of the tracepoint either so...
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette