redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

ACPI, APEI, Print resource errors in conventional format 

Use the normal %pR-like format for MMIO and I/O port ranges.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
wifi-calibration
Bjorn Helgaas 2011-12-08 11:25:42 +08:00 committed by Len Brown
parent a654e5ee4f
commit 46b91e379f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/apei/apei-base.c
View File

@ -460,9 +460,9 @@ int apei_resources_request(struct apei_resources *resources,
desc); desc);
if (!r) { if (!r) {
pr_err(APEI_PFX pr_err(APEI_PFX
"Can not request iomem region <%016llx-%016llx> for GARs.\n", "Can not request [mem %#010llx-%#010llx] for %s registers\n",
(unsigned long long)res->start, (unsigned long long)res->start,
(unsigned long long)res->end); (unsigned long long)res->end - 1, desc);
res_bak = res; res_bak = res;
goto err_unmap_iomem; goto err_unmap_iomem;
} }
@ -472,9 +472,9 @@ int apei_resources_request(struct apei_resources *resources,
r = request_region(res->start, res->end - res->start, desc); r = request_region(res->start, res->end - res->start, desc);
if (!r) { if (!r) {
pr_err(APEI_PFX pr_err(APEI_PFX
"Can not request ioport region <%016llx-%016llx> for GARs.\n", "Can not request [io %#06llx-%#06llx] for %s registers\n",
(unsigned long long)res->start, (unsigned long long)res->start,
(unsigned long long)res->end); (unsigned long long)res->end - 1, desc);
res_bak = res; res_bak = res;
goto err_unmap_ioport; goto err_unmap_ioport;
} }

11
drivers/acpi/apei/einj.c
View File

@ -209,9 +209,10 @@ static int __einj_error_trigger(u64 trigger_paddr)
"APEI EINJ Trigger Table"); "APEI EINJ Trigger Table");
if (!r) { if (!r) {
pr_err(EINJ_PFX pr_err(EINJ_PFX
"Can not request iomem region <%016llx-%016llx> for Trigger table.\n", "Can not request [mem %#010llx-%#010llx] for Trigger table\n",
(unsigned long long)trigger_paddr, (unsigned long long)trigger_paddr,
(unsigned long long)trigger_paddr+sizeof(*trigger_tab)); (unsigned long long)trigger_paddr +
sizeof(*trigger_tab) - 1);
goto out; goto out;
} }
trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab)); trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
@ -232,9 +233,9 @@ static int __einj_error_trigger(u64 trigger_paddr)
"APEI EINJ Trigger Table"); "APEI EINJ Trigger Table");
if (!r) { if (!r) {
pr_err(EINJ_PFX pr_err(EINJ_PFX
"Can not request iomem region <%016llx-%016llx> for Trigger Table Entry.\n", "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); (unsigned long long)trigger_paddr + table_size - 1);
goto out_rel_header; goto out_rel_header;
} }
iounmap(trigger_tab); iounmap(trigger_tab);