Add support for CPER Memory Error Section 2 through MCE, allowing
to emit an mce_record trace event. The implementation follows
the existing CPER Memory Error Section (1) implementation.

Fix the mismatch between the parameter definition/declaration
of apei_mce_report_mem_error().

Signed-off-by: Pierre Gondois <[email protected]>
---
 arch/x86/include/asm/mce.h     |  5 ++++-
 arch/x86/kernel/acpi/apei.c    |  7 +++++++
 arch/x86/kernel/cpu/mce/apei.c | 12 ++++++++++++
 drivers/acpi/apei/apei-base.c  |  5 +++++
 drivers/acpi/apei/ghes.c       |  1 +
 include/acpi/apei.h            |  1 +
 6 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 9995176d68790..4a590a250720d 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -336,8 +336,11 @@ extern void (*deferred_error_int_vector)(void);
  */
 
 struct cper_sec_mem_err;
-extern void apei_mce_report_mem_error(int corrected,
+struct cper_sec_mem_err2;
+extern void apei_mce_report_mem_error(int severity,
                                      struct cper_sec_mem_err *mem_err);
+extern void apei_mce_report_mem_error2(int severity,
+                                     struct cper_sec_mem_err2 *mem_err);
 
 /*
  * Enumerate new IP types and HWID values in AMD processors which support
diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c
index e21419e686eb3..96eb75b570e4e 100644
--- a/arch/x86/kernel/acpi/apei.c
+++ b/arch/x86/kernel/acpi/apei.c
@@ -46,6 +46,13 @@ void arch_apei_report_mem_error(int sev, struct 
cper_sec_mem_err *mem_err)
 #endif
 }
 
+void arch_apei_report_mem_error2(int sev, struct cper_sec_mem_err2 *mem_err)
+{
+#ifdef CONFIG_X86_MCE
+       apei_mce_report_mem_error2(sev, mem_err);
+#endif
+}
+
 int arch_apei_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)
 {
        return apei_smca_report_x86_error(ctx_info, lapic_id);
diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c
index b993ac78a3b36..2404faa60c325 100644
--- a/arch/x86/kernel/cpu/mce/apei.c
+++ b/arch/x86/kernel/cpu/mce/apei.c
@@ -68,6 +68,18 @@ void apei_mce_report_mem_error(int severity, struct 
cper_sec_mem_err *mem_err)
 }
 EXPORT_SYMBOL_GPL(apei_mce_report_mem_error);
 
+void apei_mce_report_mem_error2(int severity, struct cper_sec_mem_err2 
*mem_err)
+{
+       u64 mask = 0;
+
+       if (!(mem_err->validation_bits & CPER_MEM2_VALID_PA))
+               return;
+       if (mem_err->validation_bits & CPER_MEM2_VALID_PA_MASK)
+               mask = mem_err->physical_addr_mask;
+
+       apei_mce_report_mem_error_common(severity, mem_err->physical_addr, 
mask);
+}
+
 int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)
 {
        const u64 *i_mce = ((const u64 *) (ctx_info + 1));
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 7a06d30bd40e9..a2dbdfabeb6c7 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -773,6 +773,11 @@ void __weak arch_apei_report_mem_error(int sev,
 }
 EXPORT_SYMBOL_GPL(arch_apei_report_mem_error);
 
+void __weak arch_apei_report_mem_error2(int sev,
+                                       struct cper_sec_mem_err2 *mem_err)
+{
+}
+
 int apei_osc_setup(void)
 {
        static u8 whea_uuid_str[] = "ed855e0c-6c90-47bf-a62a-26de0fc5ad5c";
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 07306af5a54b9..703f3b7f700a6 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -1030,6 +1030,7 @@ static void ghes_do_proc(struct ghes *ghes,
                        }
 
                        atomic_notifier_call_chain(&ghes_report_mem2_chain, 
sev, mem_err);
+                       arch_apei_report_mem_error2(sev, mem_err);
                        queued |= ghes_handle_memory_failure2(gdata, sev, sync);
                } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {
                        ghes_handle_aer(gdata);
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index dc60f7db5524f..a92174793d9c2 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -52,6 +52,7 @@ int erst_clear(u64 record_id);
 
 int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data);
 void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err);
+void arch_apei_report_mem_error2(int sev, struct cper_sec_mem_err2 *mem_err);
 
 #endif
 #endif
-- 
2.43.0


Reply via email to