Re: [RFC PATCH 07/16] PCI: Separate pci_host_bridge creation out of pci_create_root_bus()

 include/linux/pci.h       |   11 +++-
 3 files changed, 158 insertions(+), 86 deletions(-)
=20

diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index 0e5f3c9..e31604f 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c

@@ -8,6 +8,105 @@

=20
 #include "pci.h"
=20
+LIST_HEAD(pci_host_bridge_list);
+DECLARE_RWSEM(pci_host_bridge_sem);
+
+static struct resource busn_resource =3D {
+       .name   =3D "PCI busn",
+       .start  =3D 0,
+       .end    =3D 255,
+       .flags  =3D IORESOURCE_BUS,
+};
+
+static void pci_release_host_bridge_dev(struct device *dev)
+{
+       struct pci_host_bridge *bridge =3D to_pci_host_bridge(dev);
+
+       if (bridge->release_fn)
+               bridge->release_fn(bridge);
+       pci_free_resource_list(&bridge->windows);
+       kfree(bridge);
+}
+
+struct pci_host_bridge *pci_create_host_bridge(
+               struct device *parent, u32 db,
+               struct pci_ops *ops, void *sysdata,

+               struct list_head *resources)
+{
+       int error;
+       struct pci_bus *b;
+       struct pci_host_bridge *host, *h;
+       struct pci_host_bridge_window *window, *n;
+
+       down_read(&pci_host_bridge_sem);
+       list_for_each_entry(h, &pci_host_bridge_list, list) {
+               if (h->domain =3D=3D PCI_DOMAIN(db) &&
+                               h->busnum =3D=3D PCI_BUSNUM(db)) {
+                       dev_dbg(&h->dev, "pci host bridge exist\n");
+                       up_read(&pci_host_bridge_sem);
+                       return NULL;
+               }
+       }
+       up_read(&pci_host_bridge_sem);
+
+       host =3D kzalloc(sizeof(*host), GFP_KERNEL);
+       if (!host)
+               return NULL;
+
+       host->sysdata =3D sysdata;
+       host->busnum =3D PCI_BUSNUM(db);
+       host->domain =3D PCI_DOMAIN(db);
+       host->ops =3D ops;
+       host->dev.parent =3D parent;
+       INIT_LIST_HEAD(&host->windows);
+       host->dev.release =3D pci_release_host_bridge_dev;
+
+       /* this is hack, just for build, will be removed later*/
+       b =3D kzalloc(sizeof(*b), GFP_KERNEL);
+       b->sysdata =3D sysdata;
+       pci_bus_assign_domain_nr(b, parent);
+       host->domain =3D pci_domain_nr(b);
+
+       if (!resources) {
+               /* Use default IO/MEM/BUS resources*/
+               pci_add_resource(&host->windows, &ioport_resource);
+               pci_add_resource(&host->windows, &iomem_resource);
+               pci_add_resource(&host->windows, &busn_resource);
+       } else {
+               list_for_each_entry_safe(window, n, resources, list)
+                       list_move_tail(&window->list, &host->windows);
+       }
+
+       dev_set_name(&host->dev, "pci%04x:%02x", host->domain,
+                       host->busnum);
+       error =3D pcibios_root_bridge_prepare(host);
+       if(error) {
+               kfree(host);
+               return NULL;
+       }
+
+       error =3D device_register(&host->dev);
+       if (error) {
+               put_device(&host->dev);
+               return NULL;
+       }
+
+       down_write(&pci_host_bridge_sem);
+       list_add_tail(&host->list, &pci_host_bridge_list);
+       up_write(&pci_host_bridge_sem);
+       return host;
+}
+EXPORT_SYMBOL(pci_create_host_bridge);
+
+void pci_free_host_bridge(struct pci_host_bridge *host)
+{
+       down_write(&pci_host_bridge_sem);
+       list_del(&host->list);
+       up_write(&pci_host_bridge_sem);
+
+       device_unregister(&host->dev);
+}
+
 static struct pci_bus *find_pci_root_bus(struct pci_bus *bus)
 {
        while (bus->parent)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index adf4d09..d472da4 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c

@@ -17,13 +17,6 @@
 #define CARDBUS_LATENCY_TIMER  176     /* secondary latency timer */
 #define CARDBUS_RESERVE_BUSNR  3

=20
-static struct resource busn_resource =3D {
-       .name   =3D "PCI busn",
-       .start  =3D 0,
-       .end    =3D 255,
-       .flags  =3D IORESOURCE_BUS,
-};
-
 /* Ugh.  Need to stop exporting this to modules. */
 LIST_HEAD(pci_root_buses);
 EXPORT_SYMBOL(pci_root_buses);

@@ -508,31 +501,6 @@ static struct pci_bus *pci_alloc_bus(struct pci_bus =

        return b;
 }
=20
-static void pci_release_host_bridge_dev(struct device *dev)
-{
-       struct pci_host_bridge *bridge =3D to_pci_host_bridge(dev);
-
-       if (bridge->release_fn)
-               bridge->release_fn(bridge);
-
-       pci_free_resource_list(&bridge->windows);
-
-       kfree(bridge);
-}
-
-static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b)
-{
-       struct pci_host_bridge *bridge;
-
-       bridge =3D kzalloc(sizeof(*bridge), GFP_KERNEL);
-       if (!bridge)
-               return NULL;
-
-       INIT_LIST_HEAD(&bridge->windows);
-       bridge->bus =3D b;
-       return bridge;
-}
-
 static const unsigned char pcix_bus_speed[] =3D {
        PCI_SPEED_UNKNOWN,              /* 0 */
        PCI_SPEED_66MHz_PCIX,           /* 1 */

@@ -1895,52 +1863,33 @@ void __weak pcibios_remove_bus(struct pci_bus *bu=

+       b->number =3D b->busn_res.start =3D bridge->busnum;
        pci_bus_assign_domain_nr(b, parent);
-       b2 =3D pci_find_bus(pci_domain_nr(b), bus);
+       bridge->domain =3D pci_domain_nr(b);

+       b2 =3D pci_find_bus(pci_domain_nr(b), bridge->busnum);
        if (b2) {
                /* If we already got to this bus through a different brid=

-       error =3D pcibios_root_bridge_prepare(bridge);
-       if (error) {
-               kfree(bridge);
-               goto err_out;
-       }
-
-       error =3D device_register(&bridge->dev);
-       if (error) {
-               put_device(&bridge->dev);
-               goto err_out;
-       }
        b->bridge =3D get_device(&bridge->dev);
        device_enable_async_suspend(b->bridge);
        pci_set_bus_of_node(b);

@@ -1950,7 +1899,7 @@ struct pci_bus *pci_create_root_bus(struct device *=

=20
        b->dev.class =3D &pcibus_class;
        b->dev.parent =3D b->bridge;
-       dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus);
+       dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), b->number);
        error =3D device_register(&b->dev);
        if (error)
                goto class_dev_reg_err;

@@ -1966,12 +1915,11 @@ struct pci_bus *pci_create_root_bus(struct device=

=20
        /* Add initial resources to the bus */
-       list_for_each_entry_safe(window, n, resources, list) {
-               list_move_tail(&window->list, &bridge->windows);
+       list_for_each_entry(window, &bridge->windows, list) {
                res =3D window->res;
                offset =3D window->offset;
                if (res->flags & IORESOURCE_BUS)
-                       pci_bus_insert_busn_res(b, bus, res->end);
+                       pci_bus_insert_busn_res(b, b->number, res->end);
                else
                        pci_bus_add_resource(b, res, 0);
                if (offset) {

@@ -2001,6 +1949,25 @@ err_out:
        return NULL;
 }

=20
+struct pci_bus *pci_create_root_bus(struct device *parent, u32 bus,
+               struct pci_ops *ops, void *sysdata, struct list_head *res=

+{
+       struct pci_host_bridge *host;
+
+       host =3D pci_create_host_bridge(parent, bus, ops,
+                       sysdata ,resources);
+       if (!host)
+               return NULL;
+
+       host->bus =3D __pci_create_root_bus(host);
+       if (!host->bus) {
+               pci_free_host_bridge(host);
+               return NULL;
+       }
+
+       return host->bus;
+}
+
 int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
 {
        struct resource *res =3D &b->busn_res;

@@ -2069,40 +2036,37 @@ struct pci_bus *pci_scan_root_bus(struct device *=

                        PCI_BUSNUM(db));
-               pci_bus_insert_busn_res(b, PCI_BUSNUM(db), 255);
+               pci_bus_insert_busn_res(host->bus, PCI_BUSNUM(db), 255);
        }
=20
-       max =3D pci_scan_child_bus(b);
-
+       max =3D pci_scan_child_bus(host->bus);
        if (!found)
-               pci_bus_update_busn_res_end(b, max);
+               pci_bus_update_busn_res_end(host->bus, max);
=20
-       return b;
+       return host->bus;
 }
 EXPORT_SYMBOL(pci_scan_root_bus);
=20

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8b11b38..daa7f40 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h

@@ -402,7 +402,12 @@ struct pci_host_bridge_window {
 struct pci_host_bridge {
        struct device dev;
        struct pci_bus *bus;            /* root bus */
+       struct list_head list;
        struct list_head windows;       /* pci_host_bridge_windows */
+       int busnum;
+       int domain;
+       void *sysdata;
+       struct pci_ops *ops;
        void (*release_fn)(struct pci_host_bridge *);
        void *release_data;
 };

@@ -413,7 +418,9 @@ void pci_set_host_bridge_release(struct pci_host_brid=

@@ -770,6 +777,8 @@ void pci_bus_add_devices(const struct pci_bus *bus);
 struct pci_bus *pci_create_root_bus(struct device *parent, u32 bus,
                                    struct pci_ops *ops, void *sysdata,
                                    struct list_head *resources);
+struct pci_bus *__pci_create_root_bus(struct pci_host_bridge *host);
+void pci_free_host_bridge(struct pci_host_bridge *host);
 int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);
 int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);
 void pci_bus_release_busn_res(struct pci_bus *b);
--

1.7.1
=20
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
=20