Use the new interface of pci_create_bus() so that system controller's
resources are added to the root bus upon bus creation, thereby avoiding
conflicts with PCI quirks before pcibios_fixup_bus() gets the chance to do
right things in pci_scan_child_bus().
Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@xxxxxxxxx>
---
arch/mips/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 7473214..a5ff6bc 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -76,11 +76,41 @@ pcibios_align_resource(void *data, const struct resource *res,
return start;
}
+static struct pci_bus_resource *
+controller_resources(const struct pci_controller *ctrl)
+{
+ struct pci_bus_resource *mem_res, *io_res;
+
+ mem_res = kzalloc(sizeof(struct pci_bus_resource), GFP_KERNEL);
+ if (!mem_res)
+ goto err_out;
+
+ mem_res->res = ctrl->mem_resource;
+ mem_res->flags = 0;
+ INIT_LIST_HEAD(&mem_res->list);
+
+ io_res = kzalloc(sizeof(struct pci_bus_resource), GFP_KERNEL);
+ if (!io_res) {
+ kfree(mem_res);
+ goto err_out;
+ }
+
+ io_res->res = ctrl->io_resource;
+ io_res->flags = 0;
+ list_add(&io_res->list, &mem_res->list);
+
+ return mem_res;
+err_out:
+ printk(KERN_ERR "Can't allocate PCI bus resource.\n");
+ return NULL;
+}
+
static void __devinit pcibios_scanbus(struct pci_controller *hose)
{
static int next_busno;
static int need_domain_info;
struct pci_bus *bus;
+ struct pci_bus_resource *bus_res;
if (!hose->iommu)
PCI_DMA_BUS_IS_PHYS = 1;
@@ -88,7 +118,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);
+ bus_res = controller_resources(hose);
+ bus = pci_create_bus(NULL, next_busno, hose->pci_ops, hose, bus_res);
+ if (bus) {
+ bus->subordinate = pci_scan_child_bus(bus);
+ pci_bus_add_devices(bus);
+ }
+
hose->bus = bus;
need_domain_info = need_domain_info || hose->index;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
