]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI: APEI: EINJ: Fix kernel test sparse warnings
authorZaid Alali <zaidal@os.amperecomputing.com>
Tue, 17 Jun 2025 19:30:20 +0000 (12:30 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 18 Jun 2025 18:49:31 +0000 (20:49 +0200)
This patch fixes the kernel test robot warning reported here:
Link: https://lore.kernel.org/all/202410241620.oApALow5-lkp@intel.com/
Use pointers annotated with the __iomem marker for all iomem map calls,
and creates a local copy of the mapped IO memory for future access in
the code. memcpy_fromio() and memcpy_toio() are used to read/write data
from/to mapped IO memory.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Zaid Alali <zaidal@os.amperecomputing.com>
Link: https://patch.msgid.link/20250617193026.637510-2-zaidal@os.amperecomputing.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/apei/einj-core.c

index 9b041415a9d0186e34a5fbc7975566dd6aa15a80..e4fb4405deaee745426e9ba19496913455009c1c 100644 (file)
@@ -151,7 +151,7 @@ static DEFINE_MUTEX(einj_mutex);
  */
 bool einj_initialized __ro_after_init;
 
-static void *einj_param;
+static void __iomem *einj_param;
 
 static void einj_exec_ctx_init(struct apei_exec_context *ctx)
 {
@@ -216,24 +216,26 @@ static void check_vendor_extension(u64 paddr,
                                   struct set_error_type_with_address *v5param)
 {
        int     offset = v5param->vendor_extension;
-       struct  vendor_error_type_extension *v;
+       struct  vendor_error_type_extension v;
+       struct vendor_error_type_extension __iomem *p;
        u32     sbdf;
 
        if (!offset)
                return;
-       v = acpi_os_map_iomem(paddr + offset, sizeof(*v));
-       if (!v)
+       p = acpi_os_map_iomem(paddr + offset, sizeof(*p));
+       if (!p)
                return;
-       get_oem_vendor_struct(paddr, offset, v);
-       sbdf = v->pcie_sbdf;
+       memcpy_fromio(&v, p, sizeof(v));
+       get_oem_vendor_struct(paddr, offset, &v);
+       sbdf = v.pcie_sbdf;
        sprintf(vendor_dev, "%x:%x:%x.%x vendor_id=%x device_id=%x rev_id=%x\n",
                sbdf >> 24, (sbdf >> 16) & 0xff,
                (sbdf >> 11) & 0x1f, (sbdf >> 8) & 0x7,
-                v->vendor_id, v->device_id, v->rev_id);
-       acpi_os_unmap_iomem(v, sizeof(*v));
+                v.vendor_id, v.device_id, v.rev_id);
+       acpi_os_unmap_iomem(p, sizeof(v));
 }
 
-static void *einj_get_parameter_address(void)
+static void __iomem *einj_get_parameter_address(void)
 {
        int i;
        u64 pa_v4 = 0, pa_v5 = 0;
@@ -254,26 +256,30 @@ static void *einj_get_parameter_address(void)
                entry++;
        }
        if (pa_v5) {
-               struct set_error_type_with_address *v5param;
+               struct set_error_type_with_address v5param;
+               struct set_error_type_with_address __iomem *p;
 
-               v5param = acpi_os_map_iomem(pa_v5, sizeof(*v5param));
-               if (v5param) {
+               p = acpi_os_map_iomem(pa_v5, sizeof(*p));
+               if (p) {
+                       memcpy_fromio(&v5param, p, sizeof(v5param));
                        acpi5 = 1;
-                       check_vendor_extension(pa_v5, v5param);
-                       return v5param;
+                       check_vendor_extension(pa_v5, &v5param);
+                       return p;
                }
        }
        if (param_extension && pa_v4) {
-               struct einj_parameter *v4param;
+               struct einj_parameter v4param;
+               struct einj_parameter __iomem *p;
 
-               v4param = acpi_os_map_iomem(pa_v4, sizeof(*v4param));
-               if (!v4param)
+               p = acpi_os_map_iomem(pa_v4, sizeof(*p));
+               if (!p)
                        return NULL;
-               if (v4param->reserved1 || v4param->reserved2) {
-                       acpi_os_unmap_iomem(v4param, sizeof(*v4param));
+               memcpy_fromio(&v4param, p, sizeof(v4param));
+               if (v4param.reserved1 || v4param.reserved2) {
+                       acpi_os_unmap_iomem(p, sizeof(v4param));
                        return NULL;
                }
-               return v4param;
+               return p;
        }
 
        return NULL;
@@ -319,7 +325,7 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region(
 static int __einj_error_trigger(u64 trigger_paddr, u32 type,
                                u64 param1, u64 param2)
 {
-       struct acpi_einj_trigger *trigger_tab = NULL;
+       struct acpi_einj_trigger trigger_tab;
        struct apei_exec_context trigger_ctx;
        struct apei_resources trigger_resources;
        struct acpi_whea_header *trigger_entry;
@@ -327,54 +333,57 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
        u32 table_size;
        int rc = -EIO;
        struct acpi_generic_address *trigger_param_region = NULL;
+       struct acpi_einj_trigger __iomem *p;
 
-       r = request_mem_region(trigger_paddr, sizeof(*trigger_tab),
+       r = request_mem_region(trigger_paddr, sizeof(trigger_tab),
                               "APEI EINJ Trigger Table");
        if (!r) {
                pr_err("Can not request [mem %#010llx-%#010llx] for Trigger table\n",
                       (unsigned long long)trigger_paddr,
                       (unsigned long long)trigger_paddr +
-                           sizeof(*trigger_tab) - 1);
+                           sizeof(trigger_tab) - 1);
                goto out;
        }
-       trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
-       if (!trigger_tab) {
+       p = ioremap_cache(trigger_paddr, sizeof(*p));
+       if (!p) {
                pr_err("Failed to map trigger table!\n");
                goto out_rel_header;
        }
-       rc = einj_check_trigger_header(trigger_tab);
+       memcpy_fromio(&trigger_tab, p, sizeof(trigger_tab));
+       rc = einj_check_trigger_header(&trigger_tab);
        if (rc) {
                pr_warn(FW_BUG "Invalid trigger error action table.\n");
                goto out_rel_header;
        }
 
        /* No action structures in the TRIGGER_ERROR table, nothing to do */
-       if (!trigger_tab->entry_count)
+       if (!trigger_tab.entry_count)
                goto out_rel_header;
 
        rc = -EIO;
-       table_size = trigger_tab->table_size;
-       r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),
-                              table_size - sizeof(*trigger_tab),
+       table_size = trigger_tab.table_size;
+       r = request_mem_region(trigger_paddr + sizeof(trigger_tab),
+                              table_size - sizeof(trigger_tab),
                               "APEI EINJ Trigger Table");
        if (!r) {
                pr_err("Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n",
-                      (unsigned long long)trigger_paddr + sizeof(*trigger_tab),
+                      (unsigned long long)trigger_paddr + sizeof(trigger_tab),
                       (unsigned long long)trigger_paddr + table_size - 1);
                goto out_rel_header;
        }
-       iounmap(trigger_tab);
-       trigger_tab = ioremap_cache(trigger_paddr, table_size);
-       if (!trigger_tab) {
+       iounmap(p);
+       p = ioremap_cache(trigger_paddr, table_size);
+       if (!p) {
                pr_err("Failed to map trigger table!\n");
                goto out_rel_entry;
        }
+       memcpy_fromio(&trigger_tab, p, sizeof(trigger_tab));
        trigger_entry = (struct acpi_whea_header *)
-               ((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
+               ((char *)&trigger_tab + sizeof(struct acpi_einj_trigger));
        apei_resources_init(&trigger_resources);
        apei_exec_ctx_init(&trigger_ctx, einj_ins_type,
                           ARRAY_SIZE(einj_ins_type),
-                          trigger_entry, trigger_tab->entry_count);
+                          trigger_entry, trigger_tab.entry_count);
        rc = apei_exec_collect_resources(&trigger_ctx, &trigger_resources);
        if (rc)
                goto out_fini;
@@ -392,7 +401,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
 
                apei_resources_init(&addr_resources);
                trigger_param_region = einj_get_trigger_parameter_region(
-                       trigger_tab, param1, param2);
+                       &trigger_tab, param1, param2);
                if (trigger_param_region) {
                        rc = apei_resources_add(&addr_resources,
                                trigger_param_region->address,
@@ -421,13 +430,13 @@ out_release:
 out_fini:
        apei_resources_fini(&trigger_resources);
 out_rel_entry:
-       release_mem_region(trigger_paddr + sizeof(*trigger_tab),
-                          table_size - sizeof(*trigger_tab));
+       release_mem_region(trigger_paddr + sizeof(trigger_tab),
+                          table_size - sizeof(trigger_tab));
 out_rel_header:
-       release_mem_region(trigger_paddr, sizeof(*trigger_tab));
+       release_mem_region(trigger_paddr, sizeof(trigger_tab));
 out:
-       if (trigger_tab)
-               iounmap(trigger_tab);
+       if (p)
+               iounmap(p);
 
        return rc;
 }
@@ -446,8 +455,10 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
                return rc;
        apei_exec_ctx_set_input(&ctx, type);
        if (acpi5) {
-               struct set_error_type_with_address *v5param = einj_param;
+               struct set_error_type_with_address *v5param, v5_struct;
 
+               v5param = &v5_struct;
+               memcpy_fromio(v5param, einj_param, sizeof(*v5param));
                v5param->type = type;
                if (type & ACPI5_VENDOR_BIT) {
                        switch (vendor_flags) {
@@ -492,15 +503,18 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
                                break;
                        }
                }
+               memcpy_toio(einj_param, v5param, sizeof(*v5param));
        } else {
                rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
                if (rc)
                        return rc;
                if (einj_param) {
-                       struct einj_parameter *v4param = einj_param;
+                       struct einj_parameter v4param;
 
-                       v4param->param1 = param1;
-                       v4param->param2 = param2;
+                       memcpy_fromio(&v4param, einj_param, sizeof(v4param));
+                       v4param.param1 = param1;
+                       v4param.param2 = param2;
+                       memcpy_toio(einj_param, &v4param, sizeof(v4param));
                }
        }
        rc = apei_exec_run(&ctx, ACPI_EINJ_EXECUTE_OPERATION);