renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
Code

Additional ACPI update for v4.11-rc1

Browse Source 
This fixes an apparent, but actually artificial, resource conflict
 between the ACPI NVS memory region and the ACPI BERT (Boot Error
 Record Table) address range (Huang Ying).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJYuLznAAoJEILEb/54YlRxT+oP/jmX2GJ5PkqATzIu5v72uZrF
 mc5vssR9AUWwuuSkVQrPJxNYnjt1j6PrSVbo9cTlzQ+A7OtBiqNk0bMIDxTPfElW
 fdyu9hropSXuFDhBRCPz8ZI68l8be8HyjoLcQr+Og3ni320UNCSe9FzggfJ3Fnp/
 /bm8O5PbQmqSdyXb14C+2APUy4KhFwKVesIX/aESXikISMo3LjMUdaOKS1H0X4jI
 qFUNewPv0J78pz5Hm2oS3a9alh6cbEJH7uhj6kM9zjUFR7XK4sIuqk5HbvT399vc
 KgP/RoRckQPgHKGj+5YucmDmGUy0sy318BPCI3DGoRKSnINahVnwW3JzsRoLtMQg
 b/qjorB7Z7G9K2861xacojaCjMpvAiFmarTpQkqc1VMRTKP7M9rztaTVcskqmyys
 bazQ67cge/jOIXiyvRjzZkXzT8mPLiR2DBka0ZBpy8D1hzgtr8yHJAM6ryn1IS7s
 F4eKRhjatBFecxme7EHBPONhN/qRob3eteUzBkNJdggRSb7+KeTDlWtsBcxjtT+Y
 9rAdTYhMSZC9+dU4HqbTaiKFZDQKXZwJZfcLiS3DaAsZUTqBKoS2QoHzZONNqP6j
 2pi6MQ8Bd8QFK8A3p/uTAY+f99UzFVjwy9n0w9Q+cJEL0dYfCOGRV7AfzdZapZu9
 qmYWilHoj2SI396nGydr
 =bHfS
 -----END PGP SIGNATURE-----

Merge tag 'acpi-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This fixes an apparent, but actually artificial, resource conflict
  between the ACPI NVS memory region and the ACPI BERT (Boot Error
  Record Table) address range (Huang Ying)"

* tag 'acpi-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
This commit is contained in:
Linus Torvalds 2017-03-02 17:38:30 -08:00
commit 3f80dd67c3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/apei/bert.c
View File

@ -97,6 +97,7 @@ static int __init bert_check_table(struct acpi_table_bert *bert_tab)
static int __init bert_init(void)
{
struct apei_resources bert_resources;
struct acpi_bert_region *boot_error_region;
struct acpi_table_bert *bert_tab;
unsigned int region_len;
@ -127,13 +128,14 @@ static int __init bert_init(void)
}
region_len = bert_tab->region_length;
if (!request_mem_region(bert_tab->address, region_len, "APEI BERT")) {
pr_err("Can't request iomem region <%016llx-%016llx>.\n",
(unsigned long long)bert_tab->address,
(unsigned long long)bert_tab->address + region_len - 1);
return -EIO;
}
apei_resources_init(&bert_resources);
rc = apei_resources_add(&bert_resources, bert_tab->address,
region_len, true);
if (rc)
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);
if (boot_error_region) {
bert_print_all(boot_error_region, region_len);
@ -142,7 +144,9 @@ static int __init bert_init(void)
rc = -ENOMEM;
}
release_mem_region(bert_tab->address, region_len);
apei_resources_release(&bert_resources);
out_fini:
apei_resources_fini(&bert_resources);
return rc;
}