| Message ID | 1490136425-4324-10-git-send-email-tbaicar@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> On 2017/3/22 6:47, 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> > --- > drivers/acpi/apei/ghes.c | 8 +++++++- > drivers/firmware/efi/cper.c | 1 + > drivers/ras/ras.c | 1 + > include/ras/ras_event.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 54 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 3ecbacc..230b095 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -515,7 +515,13 @@ static void ghes_do_proc(struct ghes *ghes, > } > #endif > #ifdef CONFIG_RAS > - else if (trace_unknown_sec_event_enabled()) { > + else if (!uuid_le_cmp(sec_type, CPER_SEC_PROC_ARM) && > + trace_arm_event_enabled()) { > + struct cper_sec_proc_arm *arm_err; > + > + arm_err = acpi_hest_generic_data_payload(gdata); > + trace_arm_event(arm_err); > + } else if (trace_unknown_sec_event_enabled()) { > void *unknown_err = acpi_hest_generic_data_payload(gdata); > trace_unknown_sec_event(&sec_type, > fru_id, fru_text, sec_sev, > diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c > index d263bc8..37a39af 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 fb2500b..8ba5a94 100644 > --- a/drivers/ras/ras.c > +++ b/drivers/ras/ras.c > @@ -28,3 +28,4 @@ static int __init ras_init(void) > #endif > EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event); > EXPORT_TRACEPOINT_SYMBOL_GPL(unknown_sec_event); > +EXPORT_TRACEPOINT_SYMBOL_GPL(arm_event); > diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h > index 5861b6f..13befad 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) > +); > + > +/* > * Unknown Section Report > * > * This event is generated when hardware detected a hardware >
Hello Xie XiuQi, On 3/21/2017 8:48 PM, Xie XiuQi wrote: > Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> Thank you! Tyler > > On 2017/3/22 6:47, 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> >> --- >> drivers/acpi/apei/ghes.c | 8 +++++++- >> drivers/firmware/efi/cper.c | 1 + >> drivers/ras/ras.c | 1 + >> include/ras/ras_event.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ >> 4 files changed, 54 insertions(+), 1 deletion(-) >> >>
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 3ecbacc..230b095 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -515,7 +515,13 @@ static void ghes_do_proc(struct ghes *ghes, } #endif #ifdef CONFIG_RAS - else if (trace_unknown_sec_event_enabled()) { + else if (!uuid_le_cmp(sec_type, CPER_SEC_PROC_ARM) && + trace_arm_event_enabled()) { + struct cper_sec_proc_arm *arm_err; + + arm_err = acpi_hest_generic_data_payload(gdata); + trace_arm_event(arm_err); + } else if (trace_unknown_sec_event_enabled()) { void *unknown_err = acpi_hest_generic_data_payload(gdata); trace_unknown_sec_event(&sec_type, fru_id, fru_text, sec_sev, diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index d263bc8..37a39af 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 fb2500b..8ba5a94 100644 --- a/drivers/ras/ras.c +++ b/drivers/ras/ras.c @@ -28,3 +28,4 @@ static int __init ras_init(void) #endif EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event); EXPORT_TRACEPOINT_SYMBOL_GPL(unknown_sec_event); +EXPORT_TRACEPOINT_SYMBOL_GPL(arm_event); diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index 5861b6f..13befad 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) +); + +/* * Unknown Section Report * * This event is generated when hardware detected a hardware