@@ -401,14 +401,18 @@ static void ghes_clear_estatus(struct ghes *ghes,
ghes_ack_error(ghes->generic_v2);
}
-static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev)
+static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata,
+ int sev, void *data)
{
-#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
+ struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
+ int sec_sev = ghes_severity(gdata->error_severity);
unsigned long pfn;
int flags = -1;
- int sec_sev = ghes_severity(gdata->error_severity);
- struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
+ ghes_edac_report_mem_error(sev, mem_err);
+ arch_apei_report_mem_error(sev, mem_err);
+
+#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
if (!(mem_err->validation_bits & CPER_MEM_VALID_PA))
return;
@@ -569,15 +573,7 @@ static void ghes_do_proc(struct ghes *ghes,
if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
fru_text = gdata->fru_text;
- if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {
- struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
-
- ghes_edac_report_mem_error(sev, mem_err);
-
- arch_apei_report_mem_error(sev, mem_err);
- ghes_handle_memory_failure(gdata, sev);
- }
- else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {
+ if (guid_equal(sec_type, &CPER_SEC_PCIE)) {
ghes_handle_aer(gdata);
}
else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {
@@ -1190,11 +1186,25 @@ static int apei_sdei_unregister_ghes(struct ghes *ghes)
return sdei_unregister_ghes(ghes);
}
+struct ghes_err_handler_tab {
+ guid_t sec_type;
+ error_handle handle;
+};
+
+static struct ghes_err_handler_tab handler_tab[] = {
+ {
+ .sec_type = CPER_SEC_PLATFORM_MEM,
+ .handle = ghes_handle_memory_failure,
+ },
+ { /* sentinel */ }
+};
+
static int ghes_probe(struct platform_device *ghes_dev)
{
struct acpi_hest_generic *generic;
struct ghes *ghes = NULL;
unsigned long flags;
+ int i;
int rc = -EINVAL;
@@ -1308,9 +1318,20 @@ static int ghes_probe(struct platform_device *ghes_dev)
ghes_edac_register(ghes, &ghes_dev->dev);
- if (!refcount_read(&ghes_ref_count))
+ if (!refcount_read(&ghes_ref_count)) {
refcount_set(&ghes_ref_count, 1);
- else
+ /* register handler functions for the standard errors.
+ * This may be done from the corresponding drivers.
+ */
+ for (i = 0; handler_tab[i].handle; i++) {
+ if (ghes_error_notify_register(handler_tab[i].sec_type,
+ handler_tab[i].handle, NULL)) {
+ ghes_edac_unregister(ghes);
+ platform_set_drvdata(ghes_dev, NULL);
+ goto err;
+ }
+ }
+ } else
refcount_inc(&ghes_ref_count);
/* Handle any pending errors right away */
This patch adds ghes_handle_memory_failure to the new error notification method. Signed-off-by: Shiju Jose <shiju.jose@huawei.com> --- drivers/acpi/apei/ghes.c | 51 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 15 deletions(-) -- 1.9.1