Skip to content

Commit

Permalink
PCI: checking busn_res in pci_scan_root_bus()
Browse files Browse the repository at this point in the history
Some callers do not supply the bus number aperture, usually because they do
not know the end.  In this case, we assume the aperture extends from the
root bus number to bus 255, scan the bus, and shrink the bus number
resource so it ends at the largest bus number we found.

This is obviously not correct because the actual end of the aperture may
well be larger than the largest bus number we found.  But I guess it's all
we have for now.

Also print out one info about that, so we could find out which path
does not have busn_res in resources list.

[bhelgaas: changelog, _safe iterator unnecessary, use %pR format for bus]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
  • Loading branch information
Yinghai Lu authored and Bjorn Helgaas committed Jun 13, 2012
1 parent f848ffb commit 4d99f52
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1788,13 +1788,33 @@ void pci_bus_release_busn_res(struct pci_bus *b)
struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
struct pci_ops *ops, void *sysdata, struct list_head *resources)
{
struct pci_host_bridge_window *window;
bool found = false;
struct pci_bus *b;
int max;

list_for_each_entry(window, resources, list)
if (window->res->flags & IORESOURCE_BUS) {
found = true;
break;
}

b = pci_create_root_bus(parent, bus, ops, sysdata, resources);
if (!b)
return NULL;

b->busn_res.end = pci_scan_child_bus(b);
if (!found) {
dev_info(&b->dev,
"No busn resource found for root bus, will use [bus %02x-ff]\n",
bus);
pci_bus_insert_busn_res(b, bus, 255);
}

max = pci_scan_child_bus(b);

if (!found)
pci_bus_update_busn_res_end(b, max);

pci_bus_add_devices(b);
return b;
}
Expand Down

0 comments on commit 4d99f52

Please sign in to comment.