Commit 0cb3b79e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'acpi-apei'

* acpi-apei:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
parents 43e31e40 41139ac3
...@@ -97,6 +97,7 @@ static int __init bert_check_table(struct acpi_table_bert *bert_tab) ...@@ -97,6 +97,7 @@ static int __init bert_check_table(struct acpi_table_bert *bert_tab)
static int __init bert_init(void) static int __init bert_init(void)
{ {
struct apei_resources bert_resources;
struct acpi_bert_region *boot_error_region; struct acpi_bert_region *boot_error_region;
struct acpi_table_bert *bert_tab; struct acpi_table_bert *bert_tab;
unsigned int region_len; unsigned int region_len;
...@@ -127,13 +128,14 @@ static int __init bert_init(void) ...@@ -127,13 +128,14 @@ static int __init bert_init(void)
} }
region_len = bert_tab->region_length; region_len = bert_tab->region_length;
if (!request_mem_region(bert_tab->address, region_len, "APEI BERT")) { apei_resources_init(&bert_resources);
pr_err("Can't request iomem region <%016llx-%016llx>.\n", rc = apei_resources_add(&bert_resources, bert_tab->address,
(unsigned long long)bert_tab->address, region_len, true);
(unsigned long long)bert_tab->address + region_len - 1); if (rc)
return -EIO; return rc;
} rc = apei_resources_request(&bert_resources, "APEI BERT");
if (rc)
goto out_fini;
boot_error_region = ioremap_cache(bert_tab->address, region_len); boot_error_region = ioremap_cache(bert_tab->address, region_len);
if (boot_error_region) { if (boot_error_region) {
bert_print_all(boot_error_region, region_len); bert_print_all(boot_error_region, region_len);
...@@ -142,7 +144,9 @@ static int __init bert_init(void) ...@@ -142,7 +144,9 @@ static int __init bert_init(void)
rc = -ENOMEM; rc = -ENOMEM;
} }
release_mem_region(bert_tab->address, region_len); apei_resources_release(&bert_resources);
out_fini:
apei_resources_fini(&bert_resources);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment