From patchwork Tue Aug 30 16:38:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1113422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7UGd2c9025526 for ; Tue, 30 Aug 2011 16:39:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755763Ab1H3QjB (ORCPT ); Tue, 30 Aug 2011 12:39:01 -0400 Received: from smtp-out.google.com ([216.239.44.51]:36300 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755682Ab1H3QjA (ORCPT ); Tue, 30 Aug 2011 12:39:00 -0400 Received: from hpaq1.eem.corp.google.com (hpaq1.eem.corp.google.com [172.25.149.1]) by smtp-out.google.com with ESMTP id p7UGcaco004078; Tue, 30 Aug 2011 09:38:36 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1314722316; bh=61U1z/w5TilCbp0gjeB98Lj3Xa4=; h=Subject:To:From:Cc:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding; b=OgkTNKyoXsNiA+4whJvedr1QFg5SASbFgbrBiPUZfQDGqK8YXq3w/kGRS/Xug5wbc CKcHCMfY29fZqbrjRDIwA== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=subject:to:from:cc:date:message-id:user-agent: mime-version:content-type:content-transfer-encoding:x-system-of-record; b=pMrQy3wtznV5mn+d1r7Dle//V/S62CBSyeAXUGW29lWTNc2vNtwC6N2ADluQ2DiYl hIfB/0h/U1R110mWtreTw== Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.18.96.155]) by hpaq1.eem.corp.google.com with ESMTP id p7UGcY3n000577; Tue, 30 Aug 2011 09:38:35 -0700 Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id 6E71720744; Tue, 30 Aug 2011 09:38:34 -0700 (PDT) Subject: [PATCH 2] ACPI, APEI, Print resource errors in conventional format To: Huang Ying From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, Len Brown Date: Tue, 30 Aug 2011 10:38:34 -0600 Message-ID: <20110830163834.13116.18371.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-System-Of-Record: true Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Aug 2011 16:39:28 +0000 (UTC) Use the normal %pR-like format for MMIO and I/O port ranges. Signed-off-by: Bjorn Helgaas Acked-by: Huang Ying --- drivers/acpi/apei/apei-base.c | 8 ++++---- drivers/acpi/apei/einj.c | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index 8041248..8bd5f1a 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c @@ -460,9 +460,9 @@ int apei_resources_request(struct apei_resources *resources, desc); if (!r) { 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->end); + (unsigned long long)res->end - 1, desc); res_bak = res; 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); if (!r) { 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->end); + (unsigned long long)res->end - 1, desc); res_bak = res; goto err_unmap_ioport; } diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 589b96c..d253902 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -209,9 +209,10 @@ static int __einj_error_trigger(u64 trigger_paddr) "APEI EINJ Trigger Table"); if (!r) { 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+sizeof(*trigger_tab)); + (unsigned long long)trigger_paddr + + sizeof(*trigger_tab) - 1); goto out; } 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"); if (!r) { pr_err(EINJ_PFX -"Can not request iomem region <%016llx-%016llx> for Trigger Table Entry.\n", - (unsigned long long)trigger_paddr+sizeof(*trigger_tab), - (unsigned long long)trigger_paddr + table_size); +"Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n", + (unsigned long long)trigger_paddr + sizeof(*trigger_tab), + (unsigned long long)trigger_paddr + table_size - 1); goto out_rel_header; } iounmap(trigger_tab);