|
@@ -81,6 +81,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
|
|
|
{
|
|
|
static int next_busno;
|
|
|
static int need_domain_info;
|
|
|
+ LIST_HEAD(resources);
|
|
|
struct pci_bus *bus;
|
|
|
|
|
|
if (!hose->iommu)
|
|
@@ -89,7 +90,13 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
|
|
|
if (hose->get_busno && pci_probe_only)
|
|
|
next_busno = (*hose->get_busno)();
|
|
|
|
|
|
- bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
|
|
|
+ pci_add_resource(&resources, hose->mem_resource);
|
|
|
+ pci_add_resource(&resources, hose->io_resource);
|
|
|
+ bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
|
|
|
+ &resources);
|
|
|
+ if (!bus)
|
|
|
+ pci_free_resource_list(&resources);
|
|
|
+
|
|
|
hose->bus = bus;
|
|
|
|
|
|
need_domain_info = need_domain_info || hose->index;
|
|
@@ -245,15 +252,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
|
|
|
{
|
|
|
/* Propagate hose info into the subordinate devices. */
|
|
|
|
|
|
- struct pci_controller *hose = bus->sysdata;
|
|
|
struct list_head *ln;
|
|
|
struct pci_dev *dev = bus->self;
|
|
|
|
|
|
- if (!dev) {
|
|
|
- bus->resource[0] = hose->io_resource;
|
|
|
- bus->resource[1] = hose->mem_resource;
|
|
|
- } else if (pci_probe_only &&
|
|
|
- (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
|
|
|
+ if (pci_probe_only && dev &&
|
|
|
+ (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
|
|
|
pci_read_bridge_bases(bus);
|
|
|
pcibios_fixup_device_resources(dev, bus);
|
|
|
}
|