| Message ID | 1494883680-25551-11-git-send-email-tbaicar@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, May 15, 2017 at 03:27:59PM -0600, Tyler Baicar wrote: > 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. > > Signed-off-by: Tyler Baicar <tbaicar@codeaurora.org> > Acked-by: Steven Rostedt <rostedt@goodmis.org> > Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> > --- > drivers/acpi/apei/ghes.c | 6 +++++- > drivers/firmware/efi/cper.c | 1 + > drivers/ras/ras.c | 6 ++++++ > include/linux/ras.h | 3 +++ > include/ras/ras_event.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 60 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 1106722..2dddb3b 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -518,7 +518,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); > + > + call_arm_trace_event(err); > + } else { > void *err = acpi_hest_get_payload(gdata); > > call_non_standard_trace_event(&sec_type, fru_id, > diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c > index d5a5855..48a8f69 100644 > --- 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 57363be..8655ef4 100644 > --- a/drivers/ras/ras.c > +++ b/drivers/ras/ras.c > @@ -20,6 +20,11 @@ void call_non_standard_trace_event(const uuid_le *sec_type, > trace_non_standard_event(sec_type, fru_id, fru_text, sev, err, len); > } > > +void call_arm_trace_event(struct cper_sec_proc_arm *err) log_arm_hw_error() because it is exactly that - a hardware error.
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 1106722..2dddb3b 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -518,7 +518,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); + + call_arm_trace_event(err); + } else { void *err = acpi_hest_get_payload(gdata); call_non_standard_trace_event(&sec_type, fru_id, diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index d5a5855..48a8f69 100644 --- 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 57363be..8655ef4 100644 --- a/drivers/ras/ras.c +++ b/drivers/ras/ras.c @@ -20,6 +20,11 @@ void call_non_standard_trace_event(const uuid_le *sec_type, trace_non_standard_event(sec_type, fru_id, fru_text, sev, err, len); } +void call_arm_trace_event(struct cper_sec_proc_arm *err) +{ + trace_arm_event(err); +} + static int __init ras_init(void) { int rc = 0; @@ -36,3 +41,4 @@ static int __init ras_init(void) #endif EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event); EXPORT_TRACEPOINT_SYMBOL_GPL(non_standard_event); +EXPORT_TRACEPOINT_SYMBOL_GPL(arm_event); diff --git a/include/linux/ras.h b/include/linux/ras.h index 7d397a1..988e3ac 100644 --- a/include/linux/ras.h +++ b/include/linux/ras.h @@ -2,6 +2,7 @@ #define __RAS_H__ #include <linux/uuid.h> +#include <linux/cper.h> #ifdef CONFIG_DEBUG_FS int ras_userspace_consumers(void); @@ -17,10 +18,12 @@ void call_non_standard_trace_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 call_arm_trace_event(struct cper_sec_proc_arm *err); #else static void call_non_standard_trace_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 call_arm_trace_event(struct cper_sec_proc_arm *err) { return; } #endif #endif diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index 4f79ba9..429f46f 100644 --- a/include/ras/ras_event.h +++ b/include/ras/ras_event.h @@ -162,6 +162,51 @@ ); /* + * 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 * * This event is generated when hardware detected a hardware