From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Dominik Brodowski <linux@dominikbrodowski.net>,
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 05/18] PCI, x86: Register busn_res for root buses
Date: Mon, 27 Feb 2012 18:09:56 -0800 [thread overview]
Message-ID: <1330395009-29260-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330395009-29260-1-git-send-email-yinghai@kernel.org>
update x86_pci_root_bus_resources() to get bus_max for non-acpi case.
update pci_acpi_scan_root_bus, and pci_scan_root_bus_on_node
to insert busn_res before scan child bus.
So could make root bus busn_res is kept the original large one.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/include/asm/topology.h | 3 ++-
arch/x86/pci/acpi.c | 8 +++++---
arch/x86/pci/bus_numa.c | 9 ++++++++-
arch/x86/pci/common.c | 12 +++++++++---
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index b9676ae..8413481 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -172,7 +172,8 @@ static inline void arch_fix_phys_package_id(int num, u32 slot)
}
struct pci_bus;
-void x86_pci_root_bus_resources(int bus, struct list_head *resources);
+void x86_pci_root_bus_resources(int bus, int *bus_max,
+ struct list_head *resources);
#ifdef CONFIG_SMP
#define mc_capable() ((boot_cpu_data.x86_max_cores > 1) && \
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 7538fad..7bb327f 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -368,6 +368,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
struct pci_root_info *info = NULL;
int domain = root->segment;
int busnum = root->secondary.start;
+ int busmax = root->secondary.end;
LIST_HEAD(resources);
struct pci_bus *bus;
struct pci_sysdata *sd;
@@ -436,14 +437,15 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
add_resources(info, &resources);
else {
free_pci_root_info(info);
- x86_pci_root_bus_resources(busnum, &resources);
+ x86_pci_root_bus_resources(busnum, &busmax, &resources);
}
bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd,
&resources);
- if (bus)
+ if (bus) {
+ pci_bus_insert_busn_res(bus, busnum, busmax);
bus->subordinate = pci_scan_child_bus(bus);
- else
+ } else
pci_free_resource_list(&resources);
if (pci_use_crs) {
diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
index 7251011..91ce4dd 100644
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
@@ -20,7 +20,8 @@ static struct pci_root_info *x86_find_pci_root_info(int bus)
return NULL;
}
-void x86_pci_root_bus_resources(int bus, struct list_head *resources)
+void x86_pci_root_bus_resources(int bus, int *bus_max,
+ struct list_head *resources)
{
struct pci_root_info *info = x86_find_pci_root_info(bus);
struct pci_root_res *root_res;
@@ -43,6 +44,8 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
root = &iomem_resource;
insert_resource(root, res);
}
+
+ *bus_max = info->bus_max;
return;
default_resources:
@@ -54,6 +57,10 @@ default_resources:
printk(KERN_DEBUG "PCI: root bus %02x: using default resources\n", bus);
pci_add_resource(resources, &ioport_resource);
pci_add_resource(resources, &iomem_resource);
+ if (!bus)
+ *bus_max = 0xff;
+ else if (!*bus_max)
+ *bus_max = bus;
}
struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max,
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8e04ec5..5115606 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -623,6 +623,7 @@ struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops,
LIST_HEAD(resources);
struct pci_bus *bus = NULL;
struct pci_sysdata *sd;
+ int bus_max;
/*
* Allocate per-root-bus (not per bus) arch-specific data.
@@ -635,13 +636,18 @@ struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops,
return NULL;
}
sd->node = node;
- x86_pci_root_bus_resources(busno, &resources);
- printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busno);
- bus = pci_scan_root_bus(NULL, busno, ops, sd, &resources);
+ x86_pci_root_bus_resources(busno, &bus_max, &resources);
+ printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x-%02x)\n",
+ busno, bus_max);
+ bus = pci_create_root_bus(NULL, busno, &pci_root_ops, sd, &resources);
if (!bus) {
pci_free_resource_list(&resources);
kfree(sd);
+ return bus;
}
+ pci_bus_insert_busn_res(bus, busno, bus_max);
+ bus->subordinate = pci_scan_child_bus(bus);
+ pci_bus_add_devices(bus);
return bus;
}
--
1.7.7
next prev parent reply other threads:[~2012-02-28 2:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 2:09 [PATCH -v8 0/18] PCI: allocate pci bus num range for unassigned bridge busn Yinghai Lu
2012-02-28 2:09 ` [PATCH 01/18] x86, PCI: Merge pcibios_scan_root and pci_scan_bus_on_node Yinghai Lu
2012-02-28 2:09 ` [PATCH 02/18] PCI: Add busn_res into struct pci_bus Yinghai Lu
2012-02-28 2:09 ` [PATCH 03/18] PCI: Add busn_res operation functions Yinghai Lu
2012-02-28 2:09 ` [PATCH 04/18] PCI: Add busn_res tracking in core Yinghai Lu
2012-02-28 2:09 ` Yinghai Lu [this message]
2012-02-28 2:09 ` [PATCH 06/18] PCI, ia64: Register busn_res for root buses Yinghai Lu
2012-02-28 2:09 ` [PATCH 07/18] PCI, sparc: " Yinghai Lu
2012-02-28 2:09 ` [PATCH 08/18] PCI, powerpc: " Yinghai Lu
2012-02-28 5:36 ` Bjorn Helgaas
2012-02-28 8:54 ` Benjamin Herrenschmidt
2012-02-28 23:31 ` Bjorn Helgaas
2012-02-28 23:41 ` Benjamin Herrenschmidt
2012-02-28 2:10 ` [PATCH 09/18] PCI, parisc: " Yinghai Lu
2012-02-28 2:10 ` [PATCH 10/18] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-02-28 2:10 ` [PATCH 11/18] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-02-28 2:10 ` [PATCH 12/18] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-02-28 2:10 ` [PATCH 13/18] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-02-28 2:10 ` [PATCH 14/18] PCI: kill pci_fixup_parent_subordinate_busnr() Yinghai Lu
2012-02-28 2:10 ` [PATCH 15/18] PCI: Seperate child bus scanning to two passes overall Yinghai Lu
2012-02-28 2:10 ` [PATCH 16/18] pcmcia: remove workaround for fixing pci parent bus subordinate Yinghai Lu
2012-02-28 2:10 ` [PATCH 17/18] PCI: Double checking setting for bus register and bus struct Yinghai Lu
2012-02-28 2:10 ` [PATCH 18/18] PCI, pciehp: Remove not needed bus number range checking Yinghai Lu
2012-02-28 10:03 ` [PATCH -v8 0/23] PCI: allocate pci bus num range for unassigned bridge busn 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=1330395009-29260-6-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.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=linux@dominikbrodowski.net \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.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).