| Message ID | 1425868467-9667-14-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Mar 09, 2015 at 10:34:10AM +0800, Yijing Wang wrote: > Introduce new scan function pci_scan_host_bridge() to > support host bridge drivers that need to provide platform > own pci_host_bridge_ops. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > drivers/pci/probe.c | 22 ++++++++++++++++++++++ > include/linux/pci.h | 4 ++++ > 2 files changed, 26 insertions(+), 0 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 59d9be3..99f17e3 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2064,6 +2064,28 @@ static struct pci_bus *__pci_scan_root_bus( > return b; > } > > +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, > + u32 db, struct pci_ops *ops, void *sysdata, > + struct list_head *resources, > + struct pci_host_bridge_ops *phb_ops) Drop the "phb_" prefix. > +{ > + struct pci_host_bridge *host; > + struct pci_bus *bus; > + > + host = pci_create_host_bridge(parent, db, resources, > + sysdata, phb_ops); > + if (!host) > + return NULL; > + > + bus = __pci_scan_root_bus(host, ops); > + if (!bus) > + pci_free_host_bridge(host); > + > + return host; > +} > +EXPORT_SYMBOL(pci_scan_host_bridge); > + > + > struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, > struct pci_ops *ops, void *sysdata, struct list_head *resources) > { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index e9922b1..28eafb5 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -790,6 +790,10 @@ void pci_bus_release_busn_res(struct pci_bus *b); > struct pci_bus *pci_scan_root_bus(struct device *parent, u32 dombus, > struct pci_ops *ops, void *sysdata, > struct list_head *resources); > +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, > + u32 dombus, struct pci_ops *ops, void *sysdata, > + struct list_head *resources, > + struct pci_host_bridge_ops *phb_ops); > struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, > int busnr); > void pcie_update_link_speed(struct pci_bus *bus, u16 link_status); > -- > 1.7.1 > > -- > 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 -- 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
>> +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, >> + u32 db, struct pci_ops *ops, void *sysdata, >> + struct list_head *resources, >> + struct pci_host_bridge_ops *phb_ops) > > Drop the "phb_" prefix. OK. > >> +{ >> + struct pci_host_bridge *host; >> + struct pci_bus *bus; >> + >> + host = pci_create_host_bridge(parent, db, resources, >> + sysdata, phb_ops); >> + if (!host) >> + return NULL; >> + >> + bus = __pci_scan_root_bus(host, ops); >> + if (!bus) >> + pci_free_host_bridge(host); >> + >> + return host; >> +} >> +EXPORT_SYMBOL(pci_scan_host_bridge); >> + >> + >> struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, >> struct pci_ops *ops, void *sysdata, struct list_head *resources) >> { >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> index e9922b1..28eafb5 100644 >> --- a/include/linux/pci.h >> +++ b/include/linux/pci.h >> @@ -790,6 +790,10 @@ void pci_bus_release_busn_res(struct pci_bus *b); >> struct pci_bus *pci_scan_root_bus(struct device *parent, u32 dombus, >> struct pci_ops *ops, void *sysdata, >> struct list_head *resources); >> +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, >> + u32 dombus, struct pci_ops *ops, void *sysdata, >> + struct list_head *resources, >> + struct pci_host_bridge_ops *phb_ops); >> struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, >> int busnr); >> void pcie_update_link_speed(struct pci_bus *bus, u16 link_status); >> -- >> 1.7.1 >> >> -- >> 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 > > . >
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 59d9be3..99f17e3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2064,6 +2064,28 @@ static struct pci_bus *__pci_scan_root_bus( return b; } +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, + u32 db, struct pci_ops *ops, void *sysdata, + struct list_head *resources, + struct pci_host_bridge_ops *phb_ops) +{ + struct pci_host_bridge *host; + struct pci_bus *bus; + + host = pci_create_host_bridge(parent, db, resources, + sysdata, phb_ops); + if (!host) + return NULL; + + bus = __pci_scan_root_bus(host, ops); + if (!bus) + pci_free_host_bridge(host); + + return host; +} +EXPORT_SYMBOL(pci_scan_host_bridge); + + struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, struct pci_ops *ops, void *sysdata, struct list_head *resources) { diff --git a/include/linux/pci.h b/include/linux/pci.h index e9922b1..28eafb5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -790,6 +790,10 @@ void pci_bus_release_busn_res(struct pci_bus *b); struct pci_bus *pci_scan_root_bus(struct device *parent, u32 dombus, struct pci_ops *ops, void *sysdata, struct list_head *resources); +struct pci_host_bridge *pci_scan_host_bridge(struct device *parent, + u32 dombus, struct pci_ops *ops, void *sysdata, + struct list_head *resources, + struct pci_host_bridge_ops *phb_ops); struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr); void pcie_update_link_speed(struct pci_bus *bus, u16 link_status);