Add enable_local to prepare assign unassigned resource
for per root bus.
Per Bjorn, separate it to different patch.
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
drivers/pci/setup-bus.c | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -1354,9 +1354,9 @@ void __init pci_realloc_get_opt(char *st
else if (!strncmp(str, "on", 2))
pci_realloc_enable = user_enabled;
}
-static bool __init pci_realloc_enabled(void)
+static bool __init pci_realloc_enabled(enum enable_type enable)
{
- return pci_realloc_enable >= user_enabled;
+ return enable >= user_enabled;
}
#if defined(CONFIG_PCI_IOV) && defined(CONFIG_PCI_REALLOC_ENABLE_AUTO)
@@ -1378,25 +1378,25 @@ static int __init check_unassigned_resou
return 0;
}
-static void __init pci_realloc_detect(void)
+static enum enable_type __init pci_realloc_detect(struct pci_bus *bus,
+ enum enable_type enable_local)
{
int unassigned = 0;
- struct pci_bus *bus;
- if (pci_realloc_enable != undefined)
- return;
+ if (enable_local != undefined)
+ return enable_local;
- list_for_each_entry(bus, &pci_root_buses, node) {
- pci_walk_bus(bus, check_unassigned_resources, &unassigned);
- if (unassigned) {
- pci_realloc_enable = auto_enabled;
- return;
- }
- }
+ pci_walk_bus(bus, check_unassigned_resources, &unassigned);
+ if (unassigned)
+ return auto_enabled;
+
+ return enable_local;
}
#else
-static void __init pci_realloc_detect(void)
+static enum enable_type __init pci_realloc_detect(struct pci_bus *bus,
+ enum enable_type enable_local)
{
+ return enable_local;
}
#endif
@@ -1419,10 +1419,12 @@ pci_assign_unassigned_resources(void)
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
IORESOURCE_PREFETCH;
int pci_try_num = 1;
+ enum enable_type enable_local = pci_realloc_enable;
+
+ list_for_each_entry(bus, &pci_root_buses, node)
+ enable_local = pci_realloc_detect(bus, enable_local);
- /* don't realloc if asked to do so */
- pci_realloc_detect();
- if (pci_realloc_enabled()) {
+ if (pci_realloc_enabled(enable_local)) {
int max_depth = pci_get_max_depth();
pci_try_num = max_depth + 1;
@@ -1454,9 +1456,9 @@ again:
goto enable_and_dump;
if (tried_times >= pci_try_num) {
- if (pci_realloc_enable == undefined)
+ if (enable_local == undefined)
printk(KERN_INFO "Some PCI device resources are
unassigned, try booting with pci=realloc\n");
- else if (pci_realloc_enable == auto_enabled)
+ else if (enable_local == auto_enabled)
printk(KERN_INFO "Automatically enabled pci realloc, if
you have problem, try booting with pci=realloc=off\n");
free_list(&fail_head);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
