From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH -v3 11/11] x86, PCI: Merge root info printing for not using _CRS path
Date: Sun, 18 Mar 2012 22:40:24 -0700 [thread overview]
Message-ID: <1332135624-13528-12-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1332135624-13528-1-git-send-email-yinghai@kernel.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/pci/amd_bus.c | 12 +-----------
arch/x86/pci/broadcom_bus.c | 9 +--------
arch/x86/pci/bus_numa.c | 17 +++++++++++++++++
arch/x86/pci/bus_numa.h | 1 +
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 459a731..0b6abbe 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -291,17 +291,7 @@ static int __init early_fill_mp_bus_info(void)
}
}
- list_for_each_entry(info, &pci_root_infos, list) {
- int busnum;
- struct pci_root_res *root_res;
-
- busnum = info->bus_min;
- printk(KERN_DEBUG "bus: [%02x, %02x] on node %x link %x\n",
- info->bus_min, info->bus_max, info->node, info->link);
- list_for_each_entry(root_res, &info->resources, list)
- printk(KERN_DEBUG "bus: %02x %pR\n",
- busnum, &root_res->res);
- }
+ print_pci_root_info(info, "bus:", true);
return 0;
}
diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c
index 614392c..a03a14a 100644
--- a/arch/x86/pci/broadcom_bus.c
+++ b/arch/x86/pci/broadcom_bus.c
@@ -76,14 +76,7 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func)
update_res(info, res.start, res.end, res.flags, 0);
}
- /* print information about this host bridge */
- res.start = fbus;
- res.end = lbus;
- res.flags = IORESOURCE_BUS;
- printk(KERN_INFO "CNB20LE PCI Host Bridge (domain 0000 %pR)\n", &res);
-
- list_for_each_entry(root_res, &info->resources, list)
- printk(KERN_INFO "host bridge window %pR\n", &root_res->res);
+ print_pci_root_info(info, "host bridge windows: ", false);
}
static int __init broadcom_postcore_init(void)
diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
index 306579f..7251011 100644
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
@@ -77,6 +77,23 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max,
return info;
}
+void print_pci_root_info(struct pci_root_info *info, char *name, bool nodelink)
+{
+ struct pci_root_res *root_res;
+ int busnum = info->bus_min;
+
+ if (!nodelink)
+ printk(KERN_DEBUG "%s: [%02x, %02x]\n", name,
+ info->bus_min, info->bus_max);
+ else
+ printk(KERN_DEBUG "%s: [%02x, %02x] on node %x link %x\n", name,
+ info->bus_min, info->bus_max, info->node, info->link);
+
+ list_for_each_entry(root_res, &info->resources, list)
+ printk(KERN_DEBUG "%s: %02x %pR\n", name, busnum,
+ &root_res->res);
+}
+
void __devinit update_res(struct pci_root_info *info, resource_size_t start,
resource_size_t end, unsigned long flags, int merge)
{
diff --git a/arch/x86/pci/bus_numa.h b/arch/x86/pci/bus_numa.h
index 226a466..d19ac93 100644
--- a/arch/x86/pci/bus_numa.h
+++ b/arch/x86/pci/bus_numa.h
@@ -22,6 +22,7 @@ struct pci_root_info {
extern struct list_head pci_root_infos;
struct pci_root_info *alloc_pci_root_info(int bus_min, int bus_max,
int node, int link);
+void print_pci_root_info(struct pci_root_info *info, char *name, bool nodelink);
extern void update_res(struct pci_root_info *info, resource_size_t start,
resource_size_t end, unsigned long flags, int merge);
#endif
--
1.7.7
next prev parent reply other threads:[~2012-03-19 5:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 5:40 [PATCH -v3 00/11] PCI: pci_host_bridge related cleanup Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 01/11] PCI: Separate host_bridge code out from probe.c Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 02/11] x86, PCI: Fix memleak with get_current_resources() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 03/11] PCI: Rename pci_host_bridge() to find_pci_root_bridge() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 04/11] PCI: Add generic device into pci_host_bridge struct Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 05/11] PCI: Add host bridge release support Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 06/11] x86, PCI: Break down get_current_resource() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 07/11] x86, PCI: Add host bridge resource release for _CRS path Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 08/11] x86, PCI: Embed name into pci_root_info struct Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 09/11] x86, PCI: Embed pci_sysdata into pci_root_info on acpi path Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 10/11] x86, PCI: Allocate pci_root_info for not using _CRS path Yinghai Lu
2012-03-19 5:40 ` Yinghai Lu [this message]
2012-04-30 22:59 ` [PATCH -v3 00/11] PCI: pci_host_bridge related cleanup Bjorn Helgaas
2012-05-01 0:28 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332135624-13528-12-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).