[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <95baa46a5e1c88f08e328dbbfbbd01602e092234.1719471257.git.mchehab+huawei@kernel.org>
Date: Thu, 27 Jun 2024 09:01:08 +0200
From: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
To:
Cc: Daniel Ferguson <danielf@...amperecomputing.com>,
"Rafael J. Wysocki" <rafael@...nel.org>,
Borislav Petkov <bp@...en8.de>,
Dan Williams <dan.j.williams@...el.com>,
Dave Jiang <dave.jiang@...el.com>,
Ira Weiny <ira.weiny@...el.com>,
James Morse <james.morse@....com>,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
Len Brown <lenb@...nel.org>,
Shengwei Luo <luoshengwei@...wei.com>,
Shiju Jose <shiju.jose@...wei.com>,
Shuai Xue <xueshuai@...ux.alibaba.com>,
Tony Luck <tony.luck@...el.com>,
linux-acpi@...r.kernel.org,
linux-edac@...r.kernel.org,
linux-kernel@...r.kernel.org,
Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: [PATCH 1/2] RAS: ACPI: APEI: add conditional compilation to ARM error report functions
From: Daniel Ferguson <danielf@...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@...amperecomputing.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
---
drivers/acpi/apei/ghes.c | 11 +++++------
drivers/ras/ras.c | 2 ++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 623cc0cb4a65..25f876b8fa4c 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -529,8 +529,9 @@ 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)
{
+#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;
@@ -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)
--
2.45.2
Powered by blists - more mailing lists