Merge tag 'please-pull-einj-mmcfg' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras

Pull RAS update from Tony Luck:

  "When checking addresses in APEI action entries for validity, allow
   access to the mmcfg space - some error injection functions need to do
   this."

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 26 insertions, 6 deletions

diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 2cd7bdd6c8b3..a85ac07f3da3 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -449,7 +449,7 @@ int apei_resources_sub(struct apei_resources *resources1,
 }
 EXPORT_SYMBOL_GPL(apei_resources_sub);
 
-static int apei_get_nvs_callback(__u64 start, __u64 size, void *data)
+static int apei_get_res_callback(__u64 start, __u64 size, void *data)
 {
         struct apei_resources *resources = data;
         return apei_res_add(&resources->iomem, start, size);
@@ -457,7 +457,15 @@ static int apei_get_nvs_callback(__u64 start, __u64 size, void *data)
 
 static int apei_get_nvs_resources(struct apei_resources *resources)
 {
-        return acpi_nvs_for_each_region(apei_get_nvs_callback, resources);
+        return acpi_nvs_for_each_region(apei_get_res_callback, resources);
+}
+
+int (*arch_apei_filter_addr)(int (*func)(__u64 start, __u64 size,
+                                     void *data), void *data);
+static int apei_get_arch_resources(struct apei_resources *resources)
+
+{
+        return arch_apei_filter_addr(apei_get_res_callback, resources);
 }
 
 /*
@@ -470,7 +478,7 @@ int apei_resources_request(struct apei_resources *resources,
 {
         struct apei_res *res, *res_bak = NULL;
         struct resource *r;
-        struct apei_resources nvs_resources;
+        struct apei_resources nvs_resources, arch_res;
         int rc;
 
         rc = apei_resources_sub(resources, &apei_resources_all);
@@ -485,10 +493,20 @@ int apei_resources_request(struct apei_resources *resources,
         apei_resources_init(&nvs_resources);
         rc = apei_get_nvs_resources(&nvs_resources);
         if (rc)
-                goto res_fini;
+                goto nvs_res_fini;
         rc = apei_resources_sub(resources, &nvs_resources);
         if (rc)
-                goto res_fini;
+                goto nvs_res_fini;
+
+        if (arch_apei_filter_addr) {
+                apei_resources_init(&arch_res);
+                rc = apei_get_arch_resources(&arch_res);
+                if (rc)
+                        goto arch_res_fini;
+                rc = apei_resources_sub(resources, &arch_res);
+                if (rc)
+                        goto arch_res_fini;
+        }
 
         rc = -EINVAL;
         list_for_each_entry(res, &resources->iomem, list) {
@@ -536,7 +554,9 @@ err_unmap_iomem:
                         break;
                 release_mem_region(res->start, res->end - res->start);
         }
-res_fini:
+arch_res_fini:
+        apei_resources_fini(&arch_res);
+nvs_res_fini:
         apei_resources_fini(&nvs_resources);
         return rc;
 }