trace, ras: add ARM processor error trace event

Currently there are trace events for the various RAS
errors with the exception of ARM processor type errors.
Add a new trace event for such errors so that the user
will know when they occur. These trace events are
consistent with the ARM processor error section type
defined in UEFI 2.6 spec section N.2.4.4.

BugLink: https://launchpad.net/bugs/1696570
Signed-off-by: Tyler Baicar <tbaicar@codeaurora.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(backported from commit e9279e83ad1f4b5af541a522a81888f828210b40)
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index f7f768b2a06cbeeb9de246763cccbba9b652300b..bd54617a4fd3ff32f3d53eeeb301a50515fe8423 100644 (file)
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -519,7 +519,11 @@ static void ghes_do_proc(struct ghes *ghes,
 
                }
 #endif
-               else {
+               else if (!uuid_le_cmp(sec_type, CPER_SEC_PROC_ARM)) {
+                       struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata);
+
+                       log_arm_hw_error(err);
+               } else {
                        void *err = acpi_hest_get_payload(gdata);
 
                        log_non_standard_event(&sec_type, fru_id, fru_text,

diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
index d5a5855906d6851bc7f2d8d4f5fae82de4c27a4e..48a8f69da42aabacffe8efbbf0bae3e2d38669f3 100644 (file)
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
@@ -35,6 +35,7 @@
 #include <linux/printk.h>
 #include <linux/bcd.h>
 #include <acpi/ghes.h>
+#include <ras/ras_event.h>
 
 #define INDENT_SP      " "
 

diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index e87fd9e32ee27be7c92b828ee49345116d71edf1..39701a5c3f495958ed7294e347f6f9ded2cd1f33 100644 (file)
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -20,6 +20,11 @@ void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
        trace_non_standard_event(sec_type, fru_id, fru_text, sev, err, len);
 }
 
+void log_arm_hw_error(struct cper_sec_proc_arm *err)
+{
+       trace_arm_event(err);
+}
+
 static int __init ras_init(void)
 {
        int rc = 0;
@@ -36,6 +41,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(extlog_mem_event);
 #endif
 EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event);
 EXPORT_TRACEPOINT_SYMBOL_GPL(non_standard_event);
+EXPORT_TRACEPOINT_SYMBOL_GPL(arm_event);
 
 int __init parse_ras_param(char *str)
 {

diff --git a/include/linux/ras.h b/include/linux/ras.h
index 67f6c981cd8cab6edae39bf46ffe4bee8f8b4335..be0ab1cc507109b4833c7d4ba763d1dd5438308d 100644 (file)
--- a/include/linux/ras.h
+++ b/include/linux/ras.h
@@ -3,6 +3,7 @@
 
 #include <asm/errno.h>
 #include <linux/uuid.h>
+#include <linux/cper.h>
 
 #ifdef CONFIG_DEBUG_FS
 int ras_userspace_consumers(void);
@@ -18,11 +19,13 @@ static inline int ras_add_daemon_trace(void) { return 0; }
 void log_non_standard_event(const uuid_le *sec_type,
                            const uuid_le *fru_id, const char *fru_text,
                            const u8 sev, const u8 *err, const u32 len);
+void log_arm_hw_error(struct cper_sec_proc_arm *err);
 #else
 static void log_non_standard_event(const uuid_le *sec_type,
                                   const uuid_le *fru_id, const char *fru_text,
                                   const u8 sev, const u8 *err,
                                   const u32 len) { return; }
+static void log_arm_hw_error(struct cper_sec_proc_arm *err) { return; }
 #endif
 
 #endif /* __RAS_H__ */

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 4f79ba94fa6bd69ce3d229e9823f73f4d73f4b1f..429f46fb61e455776b85a3166044d45a419649d3 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -161,6 +161,51 @@ TRACE_EVENT(mc_event,
                  __get_str(driver_detail))
 );
 
+/*
+ * ARM Processor Events Report
+ *
+ * This event is generated when hardware detects an ARM processor error
+ * has occurred. UEFI 2.6 spec section N.2.4.4.
+ */
+TRACE_EVENT(arm_event,
+
+       TP_PROTO(const struct cper_sec_proc_arm *proc),
+
+       TP_ARGS(proc),
+
+       TP_STRUCT__entry(
+               __field(u64, mpidr)
+               __field(u64, midr)
+               __field(u32, running_state)
+               __field(u32, psci_state)
+               __field(u8, affinity)
+       ),
+
+       TP_fast_assign(
+               if (proc->validation_bits & CPER_ARM_VALID_AFFINITY_LEVEL)
+                       __entry->affinity = proc->affinity_level;
+               else
+                       __entry->affinity = ~0;
+               if (proc->validation_bits & CPER_ARM_VALID_MPIDR)
+                       __entry->mpidr = proc->mpidr;
+               else
+                       __entry->mpidr = 0ULL;
+               __entry->midr = proc->midr;
+               if (proc->validation_bits & CPER_ARM_VALID_RUNNING_STATE) {
+                       __entry->running_state = proc->running_state;
+                       __entry->psci_state = proc->psci_state;
+               } else {
+                       __entry->running_state = ~0;
+                       __entry->psci_state = ~0;
+               }
+       ),
+
+       TP_printk("affinity level: %d; MPIDR: %016llx; MIDR: %016llx; "
+                 "running state: %d; PSCI state: %d",
+                 __entry->affinity, __entry->mpidr, __entry->midr,
+                 __entry->running_state, __entry->psci_state)
+);
+
 /*
  * Non-Standard Section Report
  *