From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 03/24] Make %pR could handle bus resource with domain Date: Sat, 4 Feb 2012 22:57:47 -0800 Message-ID: <1328425088-6562-4-git-send-email-yinghai@kernel.org> References: <1328425088-6562-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet15.oracle.com ([148.87.113.117]:61503 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754219Ab2BEG7D (ORCPT ); Sun, 5 Feb 2012 01:59:03 -0500 In-Reply-To: <1328425088-6562-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Jesse Barnes , Benjamin Herrenschmidt , Tony Luck Cc: Bjorn Helgaas , Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu So could use %pR for busn_res with domain nr in start/end Signed-off-by: Yinghai Lu Cc: Andrew Morton --- lib/vsprintf.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8e75003..9397998 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -451,6 +451,12 @@ char *resource_string(char *buf, char *end, struct resource *res, .precision = -1, .flags = SPECIAL | SMALL | ZEROPAD, }; + static const struct printf_spec domain_spec = { + .base = 16, + .field_width = 4, + .precision = -1, + .flags = SMALL | ZEROPAD, + }; static const struct printf_spec bus_spec = { .base = 16, .field_width = 2, @@ -507,11 +513,26 @@ char *resource_string(char *buf, char *end, struct resource *res, specp = &mem_spec; decode = 0; } - p = number(p, pend, res->start, *specp); - if (res->start != res->end) { - *p++ = '-'; - p = number(p, pend, res->end, *specp); + + if (res->flags & IORESOURCE_BUS && busn_domain_nr(res->end)) { + p = number(p, pend, busn_domain_nr(res->start), domain_spec); + *p++ = ':'; + p = number(p, pend, busn_bus_nr(res->start), *specp); + if (res->start != res->end) { + *p++ = '-'; + p = number(p, pend, busn_domain_nr(res->end), + domain_spec); + *p++ = ':'; + p = number(p, pend, busn_bus_nr(res->end), *specp); + } + } else { + p = number(p, pend, res->start, *specp); + if (res->start != res->end) { + *p++ = '-'; + p = number(p, pend, res->end, *specp); + } } + if (decode) { if (res->flags & IORESOURCE_MEM_64) p = string(p, pend, " 64bit", str_spec); -- 1.7.7