| Message ID | f520f2529bb27d452a2dee762b6968939df42f45.1719484498.git.mchehab+huawei@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add other fields to ARM trace event | expand |
On Thu, 27 Jun 2024 12:36:07 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > From: Daniel Ferguson <danielf@os.amperecomputing.com> > > This prevents the unnecessary inclusion of ARM specific RAS error > handling routines in non-ARM platforms. > > [mchehab: avoid unneeded ifdefs and fix coding style issues] > Signed-off-by: Daniel Ferguson <danielf@os.amperecomputing.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> With my grumpy hat on this is 2 types of change, so ideally split into 1) ifdef stuff 2) white space / linebreaks tidying up. Content is fine, Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/acpi/apei/ghes.c | 13 ++++++------- > drivers/ras/ras.c | 2 ++ > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 623cc0cb4a65..2589a3536d91 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -529,11 +529,12 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, > } > > static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, > - int sev, bool sync) > + int sev, bool sync) > { > + bool queued = false; > +#if defined(CONFIG_ARM) || defined (CONFIG_ARM64) > struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); > int flags = sync ? MF_ACTION_REQUIRED : 0; > - bool queued = false; > int sec_sev, i; > char *p; > > @@ -570,7 +571,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, > error_type); > p += err_info->length; > } > - > +#endif > return queued; > } > > @@ -773,11 +774,9 @@ static bool ghes_do_proc(struct ghes *ghes, > > arch_apei_report_mem_error(sev, mem_err); > queued = ghes_handle_memory_failure(gdata, sev, sync); > - } > - else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { > + } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { > ghes_handle_aer(gdata); > - } > - else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { > + } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { > queued = ghes_handle_arm_hw_error(gdata, sev, sync); > } else if (guid_equal(sec_type, &CPER_SEC_CXL_GEN_MEDIA_GUID)) { > struct cxl_cper_event_rec *rec = acpi_hest_get_payload(gdata); > diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c > index a6e4792a1b2e..5d94ab79c8c3 100644 > --- a/drivers/ras/ras.c > +++ b/drivers/ras/ras.c > @@ -54,7 +54,9 @@ void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id, > > void log_arm_hw_error(struct cper_sec_proc_arm *err) > { > +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) > trace_arm_event(err); > +#endif > } > > static int __init ras_init(void)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 623cc0cb4a65..2589a3536d91 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -529,11 +529,12 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, } static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, - int sev, bool sync) + int sev, bool sync) { + bool queued = false; +#if defined(CONFIG_ARM) || defined (CONFIG_ARM64) struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); int flags = sync ? MF_ACTION_REQUIRED : 0; - bool queued = false; int sec_sev, i; char *p; @@ -570,7 +571,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, error_type); p += err_info->length; } - +#endif return queued; } @@ -773,11 +774,9 @@ static bool ghes_do_proc(struct ghes *ghes, arch_apei_report_mem_error(sev, mem_err); queued = ghes_handle_memory_failure(gdata, sev, sync); - } - else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { + } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { ghes_handle_aer(gdata); - } - else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { + } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { queued = ghes_handle_arm_hw_error(gdata, sev, sync); } else if (guid_equal(sec_type, &CPER_SEC_CXL_GEN_MEDIA_GUID)) { struct cxl_cper_event_rec *rec = acpi_hest_get_payload(gdata); diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c index a6e4792a1b2e..5d94ab79c8c3 100644 --- a/drivers/ras/ras.c +++ b/drivers/ras/ras.c @@ -54,7 +54,9 @@ void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id, void log_arm_hw_error(struct cper_sec_proc_arm *err) { +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) trace_arm_event(err); +#endif } static int __init ras_init(void)