From: Aili Yao <yaoaili@xxxxxxxxxxxx>
>From commit 6915564dc5a8 ("ACPI: OSL: Change the type of
acpi_os_map_generic_address() return value"),acpi_os_map_generic_address
will return logical address or NULL for error, but pre_map_gar_callback,for
ACPI_ADR_SPACE_SYSTEM_IO case, it should be also return 0,as it's a
normal case, but now it will return -ENXIO. so check it out for such case
to avoid einj module initialization fail.
Signed-off-by: Aili Yao <yaoaili@xxxxxxxxxxxx>
---
drivers/acpi/apei/apei-base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 552fd9ffaca4..042d2dbdb855 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -230,7 +230,8 @@ static int pre_map_gar_callback(struct apei_exec_context *ctx,
{
u8 ins = entry->instruction;
- if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
+ if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER &&
+ entry->register_region.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
return apei_map_generic_address(&entry->register_region);
return 0;
--
2.18.4
