Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46b91e37 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI, APEI, Print resource errors in conventional format 



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

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a654e5ee

drivers/acpi/apei/apei-base.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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;

		}

		}

drivers/acpi/apei/einj.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -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);