|
@@ -409,6 +409,34 @@ static void ghes_clear_estatus(struct ghes *ghes)
|
|
|
ghes->flags &= ~GHES_TO_CLEAR;
|
|
|
}
|
|
|
|
|
|
+static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev)
|
|
|
+{
|
|
|
+#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
|
|
|
+ unsigned long pfn;
|
|
|
+ int sec_sev = ghes_severity(gdata->error_severity);
|
|
|
+ struct cper_sec_mem_err *mem_err;
|
|
|
+ mem_err = (struct cper_sec_mem_err *)(gdata + 1);
|
|
|
+
|
|
|
+ if (sec_sev == GHES_SEV_CORRECTED &&
|
|
|
+ (gdata->flags & CPER_SEC_ERROR_THRESHOLD_EXCEEDED) &&
|
|
|
+ (mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS)) {
|
|
|
+ pfn = mem_err->physical_addr >> PAGE_SHIFT;
|
|
|
+ if (pfn_valid(pfn))
|
|
|
+ memory_failure_queue(pfn, 0, MF_SOFT_OFFLINE);
|
|
|
+ else if (printk_ratelimit())
|
|
|
+ pr_warn(FW_WARN GHES_PFX
|
|
|
+ "Invalid address in generic error data: %#llx\n",
|
|
|
+ mem_err->physical_addr);
|
|
|
+ }
|
|
|
+ if (sev == GHES_SEV_RECOVERABLE &&
|
|
|
+ sec_sev == GHES_SEV_RECOVERABLE &&
|
|
|
+ mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS) {
|
|
|
+ pfn = mem_err->physical_addr >> PAGE_SHIFT;
|
|
|
+ memory_failure_queue(pfn, 0, 0);
|
|
|
+ }
|
|
|
+#endif
|
|
|
+}
|
|
|
+
|
|
|
static void ghes_do_proc(struct ghes *ghes,
|
|
|
const struct acpi_hest_generic_status *estatus)
|
|
|
{
|
|
@@ -428,15 +456,7 @@ static void ghes_do_proc(struct ghes *ghes,
|
|
|
apei_mce_report_mem_error(sev == GHES_SEV_CORRECTED,
|
|
|
mem_err);
|
|
|
#endif
|
|
|
-#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
|
|
|
- if (sev == GHES_SEV_RECOVERABLE &&
|
|
|
- sec_sev == GHES_SEV_RECOVERABLE &&
|
|
|
- mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS) {
|
|
|
- unsigned long pfn;
|
|
|
- pfn = mem_err->physical_addr >> PAGE_SHIFT;
|
|
|
- memory_failure_queue(pfn, 0, 0);
|
|
|
- }
|
|
|
-#endif
|
|
|
+ ghes_handle_memory_failure(gdata, sev);
|
|
|
}
|
|
|
#ifdef CONFIG_ACPI_APEI_PCIEAER
|
|
|
else if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
|