Commit 967260cd authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas

PCI: Enable unassigned resource reallocation on per-bus basis

pci_realloc_detect() turns on automatic resource allocation when it finds
unassigned SR-IOV resources.  Previously it did this on a global basis, so
we enabled reallocation if any PCI device anywhere had an unassigned SR-IOV
resource.

This patch changes pci_realloc_detect() so it looks at a single bus, so we
can do this when a host bridge is hot-added.

[bhelgaas: changelog]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent fa216bf4
...@@ -1354,9 +1354,9 @@ void __init pci_realloc_get_opt(char *str) ...@@ -1354,9 +1354,9 @@ void __init pci_realloc_get_opt(char *str)
else if (!strncmp(str, "on", 2)) else if (!strncmp(str, "on", 2))
pci_realloc_enable = user_enabled; 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) #if defined(CONFIG_PCI_IOV) && defined(CONFIG_PCI_REALLOC_ENABLE_AUTO)
...@@ -1383,24 +1383,26 @@ static int __init iov_resources_unassigned(struct pci_dev *dev, void *data) ...@@ -1383,24 +1383,26 @@ static int __init iov_resources_unassigned(struct pci_dev *dev, void *data)
return 0; 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)
{ {
bool unassigned = false; bool unassigned = false;
struct pci_bus *bus;
if (pci_realloc_enable != undefined) if (enable_local != undefined)
return; return enable_local;
list_for_each_entry(bus, &pci_root_buses, node) {
pci_walk_bus(bus, iov_resources_unassigned, &unassigned); pci_walk_bus(bus, iov_resources_unassigned, &unassigned);
if (unassigned) { if (unassigned)
pci_realloc_enable = auto_enabled; return auto_enabled;
return;
} return enable_local;
}
} }
#else #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 #endif
/* /*
...@@ -1422,10 +1424,12 @@ pci_assign_unassigned_resources(void) ...@@ -1422,10 +1424,12 @@ pci_assign_unassigned_resources(void)
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM | unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
IORESOURCE_PREFETCH; IORESOURCE_PREFETCH;
int pci_try_num = 1; 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 */ if (pci_realloc_enabled(enable_local)) {
pci_realloc_detect();
if (pci_realloc_enabled()) {
int max_depth = pci_get_max_depth(); int max_depth = pci_get_max_depth();
pci_try_num = max_depth + 1; pci_try_num = max_depth + 1;
...@@ -1457,9 +1461,9 @@ pci_assign_unassigned_resources(void) ...@@ -1457,9 +1461,9 @@ pci_assign_unassigned_resources(void)
goto enable_and_dump; goto enable_and_dump;
if (tried_times >= pci_try_num) { 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"); 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"); printk(KERN_INFO "Automatically enabled pci realloc, if you have problem, try booting with pci=realloc=off\n");
free_list(&fail_head); free_list(&fail_head);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment