Merge ACPI APEI material for v5.11.

diff --combined drivers/acpi/apei/apei-base.c
index 3294cc8,d3fbac5..c7fdb12
--- 1/drivers/acpi/apei/apei-base.c
--- 2/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@@ -287,7 -287,7 +287,7 @@@ struct apei_res 
  };
  
  /* Collect all resources requested, to avoid conflict */
- struct apei_resources apei_resources_all = {
+ static struct apei_resources apei_resources_all = {
        .iomem = LIST_HEAD_INIT(apei_resources_all.iomem),
        .ioport = LIST_HEAD_INIT(apei_resources_all.ioport),
  };
@@@ -632,15 -632,7 +632,15 @@@ int apei_map_generic_address(struct acp
        rc = apei_check_gar(reg, &address, &access_bit_width);
        if (rc)
                return rc;
 -      return acpi_os_map_generic_address(reg);
 +
 +      /* IO space doesn't need mapping */
 +      if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
 +              return 0;
 +
 +      if (!acpi_os_map_generic_address(reg))
 +              return -ENXIO;
 +
 +      return 0;
  }
  EXPORT_SYMBOL_GPL(apei_map_generic_address);