* [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number [not found] <1425868467-9667-1-git-send-email-wangyijing@huawei.com> @ 2015-03-09 2:34 ` Yijing Wang 2015-03-12 1:34 ` Bjorn Helgaas 2015-03-17 5:15 ` [Xen-devel] " Manish Jaggi 2015-03-09 2:34 ` [PATCH v6 16/30] powerpc/pci: Rename pcibios_root_bridge_prepare() Yijing Wang 2015-03-09 2:34 ` [PATCH v6 17/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang 2 siblings, 2 replies; 7+ messages in thread From: Yijing Wang @ 2015-03-09 2:34 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-mips, linux-ia64, linux-sh, linux-pci, sparclinux, Chris Metcalf, Paul Mackerras, Yijing Wang, Guan Xuetao, linux-s390, Russell King, x86, Sebastian Ott, Geert Uytterhoeven, Gerald Schaefer, xen-devel, Matt Turner, Fenghua Yu, Arnd Bergmann, Konrad Rzeszutek Wilk, Marc Zyngier, Rusty Russell, linux-m68k, Ivan Kokshaysky, Bjorn Helgaas, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Richard Henderson, Liviu Dudau, Michal Simek, Tony Luck, linux-kernel, Ralf Baechle, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller Now we could pass PCI domain combined with bus number in u32 argu. Because in arm/arm64, PCI domain number is assigned by pci_bus_assign_domain_nr(). So we leave pci_scan_root_bus() and pci_create_root_bus() in arm/arm64 unchanged. A new function pci_host_assign_domain_nr() will be introduced for arm/arm64 to assign domain number in later patch. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Richard Henderson <rth@twiddle.net> CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru> CC: Matt Turner <mattst88@gmail.com> CC: Tony Luck <tony.luck@intel.com> CC: Fenghua Yu <fenghua.yu@intel.com> CC: Michal Simek <monstr@monstr.eu> CC: Ralf Baechle <ralf@linux-mips.org> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Paul Mackerras <paulus@samba.org> CC: Michael Ellerman <mpe@ellerman.id.au> CC: Sebastian Ott <sebott@linux.vnet.ibm.com> CC: Gerald Schaefer <gerald.schaefer@de.ibm.com> CC: "David S. Miller" <davem@davemloft.net> CC: Chris Metcalf <cmetcalf@ezchip.com> CC: Thomas Gleixner <tglx@linutronix.de> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: linux-alpha@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: linux-ia64@vger.kernel.org CC: linux-mips@linux-mips.org CC: linuxppc-dev@lists.ozlabs.org CC: linux-s390@vger.kernel.org CC: linux-sh@vger.kernel.org CC: sparclinux@vger.kernel.org CC: xen-devel@lists.xenproject.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/alpha/kernel/pci.c | 5 +++-- arch/alpha/kernel/sys_nautilus.c | 4 ++-- arch/ia64/pci/pci.c | 4 ++-- arch/ia64/sn/kernel/io_init.c | 5 +++-- arch/microblaze/pci/pci-common.c | 5 +++-- arch/mips/pci/pci.c | 4 ++-- arch/powerpc/kernel/pci-common.c | 5 +++-- arch/s390/pci/pci.c | 5 +++-- arch/sh/drivers/pci/pci.c | 5 +++-- arch/sparc/kernel/pci.c | 5 +++-- arch/tile/kernel/pci.c | 5 +++-- arch/tile/kernel/pci_gx.c | 5 +++-- arch/x86/pci/acpi.c | 7 ++++--- arch/x86/pci/common.c | 3 ++- drivers/pci/xen-pcifront.c | 5 +++-- 15 files changed, 42 insertions(+), 30 deletions(-) diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 5c845ad..deb0a36 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -336,8 +336,9 @@ common_init_pci(void) pci_add_resource_offset(&resources, hose->mem_space, hose->mem_space->start); - bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops, - hose, &resources); + bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(hose->index, next_busno), + alpha_mv.pci_ops, hose, &resources); if (!bus) continue; hose->bus = bus; diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 700686d..be0bbeb 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -206,10 +206,10 @@ nautilus_init_pci(void) unsigned long memtop = max_low_pfn << PAGE_SHIFT; /* Scan our single hose. */ - bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); + bus = pci_scan_bus(PCI_DOMBUS(hose->index, 0), + alpha_mv.pci_ops, hose); if (!bus) return; - hose->bus = bus; pcibios_claim_one_bus(bus); diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 48cc657..675749f 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -465,8 +465,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) * should handle the case here, but it appears that IA64 hasn't * such quirk. So we just ignore the case now. */ - pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller, - &info->resources); + pbus = pci_create_root_bus(NULL, PCI_DOMBUS(domain, bus), + &pci_root_ops, controller, &info->resources); if (!pbus) { pci_free_resource_list(&info->resources); __release_pci_root_info(info); diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 1be65eb..7e0b7f9 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -266,8 +266,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) pci_add_resource_offset(&resources, &res[1], prom_bussoft_ptr->bs_legacy_mem); - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, - &resources); + bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(controller->segment, busnum), + &pci_root_ops, controller, &resources); if (bus == NULL) { kfree(res); kfree(controller); diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 6d8d173..34a32ec 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -1350,8 +1350,9 @@ static void pcibios_scan_phb(struct pci_controller *hose) pcibios_setup_phb_resources(hose, &resources); - bus = pci_scan_root_bus(hose->parent, hose->first_busno, - hose->ops, hose, &resources); + bus = pci_scan_root_bus(hose->parent, + PCI_DOMBUS(hose->global_number, hose->first_busno), + hose->ops, hose, &resources); if (bus == NULL) { pr_err("Failed to create bus for PCI domain %04x\n", hose->global_number); diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 9eb54b5..86f8d2b 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -92,8 +92,8 @@ static void pcibios_scanbus(struct pci_controller *hose) pci_add_resource_offset(&resources, hose->mem_resource, hose->mem_offset); pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset); - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, - &resources); + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(hose->index, next_busno), + hose->pci_ops, hose, &resources); if (!bus) pci_free_resource_list(&resources); diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 2a525c9..a467aca 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1612,8 +1612,9 @@ void pcibios_scan_phb(struct pci_controller *hose) pci_add_resource(&resources, &hose->busn); /* Create an empty bus for the toplevel */ - bus = pci_create_root_bus(hose->parent, hose->first_busno, - hose->ops, hose, &resources); + bus = pci_create_root_bus(hose->parent, + PCI_DOMBUS(hose->global_number, hose->first_busno), + hose->ops, hose, &resources); if (bus == NULL) { pr_err("Failed to create bus for PCI domain %04x\n", hose->global_number); diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index a2a7391..20e662f 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -770,8 +770,9 @@ static int zpci_scan_bus(struct zpci_dev *zdev) if (ret) return ret; - zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops, - zdev, &resources); + zdev->bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(zdev->domain, ZPCI_BUS_NR), &pci_root_ops, + zdev, &resources); if (!zdev->bus) { zpci_cleanup_bus_resources(zdev); return -EIO; diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index efc1051..116f80f 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -52,8 +52,9 @@ static void pcibios_scanbus(struct pci_channel *hose) pci_add_resource_offset(&resources, res, offset); } - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, - &resources); + bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(hose->index, next_busno), + hose->pci_ops, hose, &resources); hose->bus = bus; need_domain_info = need_domain_info || hose->index; diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 9ce5afe..838fe1e 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -667,8 +667,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, pbm->busn.end = pbm->pci_last_busno; pbm->busn.flags = IORESOURCE_BUS; pci_add_resource(&resources, &pbm->busn); - bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops, - pbm, &resources); + bus = pci_create_root_bus(parent, + PCI_DOMBUS(pbm->index, pbm->pci_first_busno), + pbm->pci_ops, pbm, &resources); if (!bus) { printk(KERN_ERR "Failed to create bus for %s\n", node->full_name); diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 9475a74..25b0d9b 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -306,8 +306,9 @@ int __init pcibios_init(void) pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); - bus = pci_scan_root_bus(NULL, 0, controller->ops, - controller, &resources); + bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(controller->index, 0), + controller->ops, controller, &resources); controller->root_bus = bus; controller->last_busno = bus->busn_res.end; } diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index b1df847..f6f41f3 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -881,8 +881,9 @@ int __init pcibios_init(void) controller->mem_offset); pci_add_resource(&resources, &controller->io_space); controller->first_busno = next_busno; - bus = pci_scan_root_bus(NULL, next_busno, controller->ops, - controller, &resources); + bus = pci_scan_root_bus(NULL, + PCI_DOMBUS(controller->index, next_busno), + controller->ops, controller, &resources); controller->root_bus = bus; next_busno = bus->busn_res.end + 1; } diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 6ac2738..ad0e926 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -424,9 +424,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) } if (!setup_mcfg_map(info, domain, (u8)root->secondary.start, - (u8)root->secondary.end, root->mcfg_addr)) - bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, - sd, &resources); + (u8)root->secondary.end, root->mcfg_addr)) + bus = pci_create_root_bus(NULL, + PCI_DOMBUS(domain, busnum), &pci_root_ops, + sd, &resources); if (bus) { pci_scan_child_bus(bus); diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 0cbc723..0160280 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -486,7 +486,8 @@ void pcibios_scan_root(int busnum) sd->node = x86_pci_root_bus_node(busnum); x86_pci_root_bus_resources(busnum, &resources); printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(0, busnum), + &pci_root_ops, sd, &resources); if (!bus) { pci_free_resource_list(&resources); kfree(sd); diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 9e7c28b..af6144a 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -479,8 +479,9 @@ static int pcifront_scan_root(struct pcifront_device *pdev, pci_lock_rescan_remove(); - b = pci_scan_root_bus(&pdev->xdev->dev, bus, - &pcifront_bus_ops, sd, &resources); + b = pci_scan_root_bus(&pdev->xdev->dev, + PCI_DOMBUS(sd->domain, bus), + &pcifront_bus_ops, sd, &resources); if (!b) { dev_err(&pdev->xdev->dev, "Error creating PCI Frontend Bus!\n"); -- 1.7.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number 2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang @ 2015-03-12 1:34 ` Bjorn Helgaas 2015-03-12 12:20 ` Yijing Wang 2015-03-17 5:15 ` [Xen-devel] " Manish Jaggi 1 sibling, 1 reply; 7+ messages in thread From: Bjorn Helgaas @ 2015-03-12 1:34 UTC (permalink / raw) To: Yijing Wang Cc: linux-mips, linux-ia64, linux-sh, linux-pci, Chris Metcalf, Paul Mackerras, sparclinux, Guan Xuetao, linux-s390, Russell King, x86, Sebastian Ott, Geert Uytterhoeven, Gerald Schaefer, xen-devel, Matt Turner, Fenghua Yu, Arnd Bergmann, Konrad Rzeszutek Wilk, Marc Zyngier, Rusty Russell, linux-m68k, Ivan Kokshaysky, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Richard Henderson, Liviu Dudau, Michal Simek, Tony Luck, linux-kernel, Ralf Baechle, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller On Mon, Mar 09, 2015 at 10:34:04AM +0800, Yijing Wang wrote: > Now we could pass PCI domain combined with bus number > in u32 argu. Because in arm/arm64, PCI domain number > is assigned by pci_bus_assign_domain_nr(). So we leave > pci_scan_root_bus() and pci_create_root_bus() in arm/arm64 > unchanged. I'm not buying this. If you're using this PCI_DOMBUS() thing (and I'm not convinced that's a good idea yet), I'm not happy with most code being pci_scan_root_bus(..., PCI_DOMBUS(hose->index, next_busno), ...) but ARM being pci_scan_root_bus(..., sys->busnr, ...) That just looks like a mistake. Make ARM use PCI_DOMBUS(0, sys->busnr) if you want, but at least make it look like you did a thorough job. > A new function pci_host_assign_domain_nr() > will be introduced for arm/arm64 to assign domain number > in later patch. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > CC: Richard Henderson <rth@twiddle.net> > CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > CC: Matt Turner <mattst88@gmail.com> > CC: Tony Luck <tony.luck@intel.com> > CC: Fenghua Yu <fenghua.yu@intel.com> > CC: Michal Simek <monstr@monstr.eu> > CC: Ralf Baechle <ralf@linux-mips.org> > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> > CC: Paul Mackerras <paulus@samba.org> > CC: Michael Ellerman <mpe@ellerman.id.au> > CC: Sebastian Ott <sebott@linux.vnet.ibm.com> > CC: Gerald Schaefer <gerald.schaefer@de.ibm.com> > CC: "David S. Miller" <davem@davemloft.net> > CC: Chris Metcalf <cmetcalf@ezchip.com> > CC: Thomas Gleixner <tglx@linutronix.de> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > CC: linux-alpha@vger.kernel.org > CC: linux-kernel@vger.kernel.org > CC: linux-ia64@vger.kernel.org > CC: linux-mips@linux-mips.org > CC: linuxppc-dev@lists.ozlabs.org > CC: linux-s390@vger.kernel.org > CC: linux-sh@vger.kernel.org > CC: sparclinux@vger.kernel.org > CC: xen-devel@lists.xenproject.org > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/alpha/kernel/pci.c | 5 +++-- > arch/alpha/kernel/sys_nautilus.c | 4 ++-- > arch/ia64/pci/pci.c | 4 ++-- > arch/ia64/sn/kernel/io_init.c | 5 +++-- > arch/microblaze/pci/pci-common.c | 5 +++-- > arch/mips/pci/pci.c | 4 ++-- > arch/powerpc/kernel/pci-common.c | 5 +++-- > arch/s390/pci/pci.c | 5 +++-- > arch/sh/drivers/pci/pci.c | 5 +++-- > arch/sparc/kernel/pci.c | 5 +++-- > arch/tile/kernel/pci.c | 5 +++-- > arch/tile/kernel/pci_gx.c | 5 +++-- > arch/x86/pci/acpi.c | 7 ++++--- > arch/x86/pci/common.c | 3 ++- > drivers/pci/xen-pcifront.c | 5 +++-- > 15 files changed, 42 insertions(+), 30 deletions(-) > > diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c > index 5c845ad..deb0a36 100644 > --- a/arch/alpha/kernel/pci.c > +++ b/arch/alpha/kernel/pci.c > @@ -336,8 +336,9 @@ common_init_pci(void) > pci_add_resource_offset(&resources, hose->mem_space, > hose->mem_space->start); > > - bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops, > - hose, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(hose->index, next_busno), > + alpha_mv.pci_ops, hose, &resources); > if (!bus) > continue; > hose->bus = bus; > diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c > index 700686d..be0bbeb 100644 > --- a/arch/alpha/kernel/sys_nautilus.c > +++ b/arch/alpha/kernel/sys_nautilus.c > @@ -206,10 +206,10 @@ nautilus_init_pci(void) > unsigned long memtop = max_low_pfn << PAGE_SHIFT; > > /* Scan our single hose. */ > - bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); > + bus = pci_scan_bus(PCI_DOMBUS(hose->index, 0), > + alpha_mv.pci_ops, hose); > if (!bus) > return; > - > hose->bus = bus; > pcibios_claim_one_bus(bus); > > diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c > index 48cc657..675749f 100644 > --- a/arch/ia64/pci/pci.c > +++ b/arch/ia64/pci/pci.c > @@ -465,8 +465,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) > * should handle the case here, but it appears that IA64 hasn't > * such quirk. So we just ignore the case now. > */ > - pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller, > - &info->resources); > + pbus = pci_create_root_bus(NULL, PCI_DOMBUS(domain, bus), > + &pci_root_ops, controller, &info->resources); > if (!pbus) { > pci_free_resource_list(&info->resources); > __release_pci_root_info(info); > diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c > index 1be65eb..7e0b7f9 100644 > --- a/arch/ia64/sn/kernel/io_init.c > +++ b/arch/ia64/sn/kernel/io_init.c > @@ -266,8 +266,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) > pci_add_resource_offset(&resources, &res[1], > prom_bussoft_ptr->bs_legacy_mem); > > - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, > - &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->segment, busnum), > + &pci_root_ops, controller, &resources); > if (bus == NULL) { > kfree(res); > kfree(controller); > diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c > index 6d8d173..34a32ec 100644 > --- a/arch/microblaze/pci/pci-common.c > +++ b/arch/microblaze/pci/pci-common.c > @@ -1350,8 +1350,9 @@ static void pcibios_scan_phb(struct pci_controller *hose) > > pcibios_setup_phb_resources(hose, &resources); > > - bus = pci_scan_root_bus(hose->parent, hose->first_busno, > - hose->ops, hose, &resources); > + bus = pci_scan_root_bus(hose->parent, > + PCI_DOMBUS(hose->global_number, hose->first_busno), > + hose->ops, hose, &resources); > if (bus == NULL) { > pr_err("Failed to create bus for PCI domain %04x\n", > hose->global_number); > diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c > index 9eb54b5..86f8d2b 100644 > --- a/arch/mips/pci/pci.c > +++ b/arch/mips/pci/pci.c > @@ -92,8 +92,8 @@ static void pcibios_scanbus(struct pci_controller *hose) > pci_add_resource_offset(&resources, > hose->mem_resource, hose->mem_offset); > pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset); > - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, > - &resources); > + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(hose->index, next_busno), > + hose->pci_ops, hose, &resources); > if (!bus) > pci_free_resource_list(&resources); > > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index 2a525c9..a467aca 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -1612,8 +1612,9 @@ void pcibios_scan_phb(struct pci_controller *hose) > pci_add_resource(&resources, &hose->busn); > > /* Create an empty bus for the toplevel */ > - bus = pci_create_root_bus(hose->parent, hose->first_busno, > - hose->ops, hose, &resources); > + bus = pci_create_root_bus(hose->parent, > + PCI_DOMBUS(hose->global_number, hose->first_busno), > + hose->ops, hose, &resources); > if (bus == NULL) { > pr_err("Failed to create bus for PCI domain %04x\n", > hose->global_number); > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c > index a2a7391..20e662f 100644 > --- a/arch/s390/pci/pci.c > +++ b/arch/s390/pci/pci.c > @@ -770,8 +770,9 @@ static int zpci_scan_bus(struct zpci_dev *zdev) > if (ret) > return ret; > > - zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops, > - zdev, &resources); > + zdev->bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(zdev->domain, ZPCI_BUS_NR), &pci_root_ops, > + zdev, &resources); > if (!zdev->bus) { > zpci_cleanup_bus_resources(zdev); > return -EIO; > diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c > index efc1051..116f80f 100644 > --- a/arch/sh/drivers/pci/pci.c > +++ b/arch/sh/drivers/pci/pci.c > @@ -52,8 +52,9 @@ static void pcibios_scanbus(struct pci_channel *hose) > pci_add_resource_offset(&resources, res, offset); > } > > - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, > - &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(hose->index, next_busno), > + hose->pci_ops, hose, &resources); > hose->bus = bus; > > need_domain_info = need_domain_info || hose->index; > diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c > index 9ce5afe..838fe1e 100644 > --- a/arch/sparc/kernel/pci.c > +++ b/arch/sparc/kernel/pci.c > @@ -667,8 +667,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, > pbm->busn.end = pbm->pci_last_busno; > pbm->busn.flags = IORESOURCE_BUS; > pci_add_resource(&resources, &pbm->busn); > - bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops, > - pbm, &resources); > + bus = pci_create_root_bus(parent, > + PCI_DOMBUS(pbm->index, pbm->pci_first_busno), > + pbm->pci_ops, pbm, &resources); > if (!bus) { > printk(KERN_ERR "Failed to create bus for %s\n", > node->full_name); > diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c > index 9475a74..25b0d9b 100644 > --- a/arch/tile/kernel/pci.c > +++ b/arch/tile/kernel/pci.c > @@ -306,8 +306,9 @@ int __init pcibios_init(void) > > pci_add_resource(&resources, &ioport_resource); > pci_add_resource(&resources, &iomem_resource); > - bus = pci_scan_root_bus(NULL, 0, controller->ops, > - controller, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->index, 0), > + controller->ops, controller, &resources); > controller->root_bus = bus; > controller->last_busno = bus->busn_res.end; > } > diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c > index b1df847..f6f41f3 100644 > --- a/arch/tile/kernel/pci_gx.c > +++ b/arch/tile/kernel/pci_gx.c > @@ -881,8 +881,9 @@ int __init pcibios_init(void) > controller->mem_offset); > pci_add_resource(&resources, &controller->io_space); > controller->first_busno = next_busno; > - bus = pci_scan_root_bus(NULL, next_busno, controller->ops, > - controller, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->index, next_busno), > + controller->ops, controller, &resources); > controller->root_bus = bus; > next_busno = bus->busn_res.end + 1; > } > diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c > index 6ac2738..ad0e926 100644 > --- a/arch/x86/pci/acpi.c > +++ b/arch/x86/pci/acpi.c > @@ -424,9 +424,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) > } > > if (!setup_mcfg_map(info, domain, (u8)root->secondary.start, > - (u8)root->secondary.end, root->mcfg_addr)) > - bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, > - sd, &resources); > + (u8)root->secondary.end, root->mcfg_addr)) > + bus = pci_create_root_bus(NULL, > + PCI_DOMBUS(domain, busnum), &pci_root_ops, > + sd, &resources); > > if (bus) { > pci_scan_child_bus(bus); > diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c > index 0cbc723..0160280 100644 > --- a/arch/x86/pci/common.c > +++ b/arch/x86/pci/common.c > @@ -486,7 +486,8 @@ void pcibios_scan_root(int busnum) > sd->node = x86_pci_root_bus_node(busnum); > x86_pci_root_bus_resources(busnum, &resources); > printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); > - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); > + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(0, busnum), > + &pci_root_ops, sd, &resources); > if (!bus) { > pci_free_resource_list(&resources); > kfree(sd); > diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c > index 9e7c28b..af6144a 100644 > --- a/drivers/pci/xen-pcifront.c > +++ b/drivers/pci/xen-pcifront.c > @@ -479,8 +479,9 @@ static int pcifront_scan_root(struct pcifront_device *pdev, > > pci_lock_rescan_remove(); > > - b = pci_scan_root_bus(&pdev->xdev->dev, bus, > - &pcifront_bus_ops, sd, &resources); > + b = pci_scan_root_bus(&pdev->xdev->dev, > + PCI_DOMBUS(sd->domain, bus), > + &pcifront_bus_ops, sd, &resources); > if (!b) { > dev_err(&pdev->xdev->dev, > "Error creating PCI Frontend Bus!\n"); > -- > 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number 2015-03-12 1:34 ` Bjorn Helgaas @ 2015-03-12 12:20 ` Yijing Wang 0 siblings, 0 replies; 7+ messages in thread From: Yijing Wang @ 2015-03-12 12:20 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-mips, linux-ia64, linux-sh, linux-pci, Chris Metcalf, Paul Mackerras, sparclinux, Guan Xuetao, linux-s390, Russell King, x86, Sebastian Ott, Geert Uytterhoeven, Gerald Schaefer, xen-devel, Matt Turner, Fenghua Yu, Arnd Bergmann, Konrad Rzeszutek Wilk, Marc Zyngier, Rusty Russell, linux-m68k, Ivan Kokshaysky, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Richard Henderson, Liviu Dudau, Michal Simek, Tony Luck, linux-kernel, Ralf Baechle, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller On 2015/3/12 9:34, Bjorn Helgaas wrote: > On Mon, Mar 09, 2015 at 10:34:04AM +0800, Yijing Wang wrote: >> Now we could pass PCI domain combined with bus number >> in u32 argu. Because in arm/arm64, PCI domain number >> is assigned by pci_bus_assign_domain_nr(). So we leave >> pci_scan_root_bus() and pci_create_root_bus() in arm/arm64 >> unchanged. > > I'm not buying this. If you're using this PCI_DOMBUS() thing (and I'm not > convinced that's a good idea yet), I'm not happy with most code being > > pci_scan_root_bus(..., PCI_DOMBUS(hose->index, next_busno), ...) Yes, it looks a little ugly. Which do you prefer, use a container structure or put all args into function directly ? > > but ARM being > > pci_scan_root_bus(..., sys->busnr, ...) > > That just looks like a mistake. Make ARM use PCI_DOMBUS(0, sys->busnr) if > you want, but at least make it look like you did a thorough job. For arm, I assumed the pci_host_assign_domain_nr() would update its domain, but it may made the code obscure. > >> A new function pci_host_assign_domain_nr() >> will be introduced for arm/arm64 to assign domain number >> in later patch. >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> CC: Richard Henderson <rth@twiddle.net> >> CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru> >> CC: Matt Turner <mattst88@gmail.com> >> CC: Tony Luck <tony.luck@intel.com> >> CC: Fenghua Yu <fenghua.yu@intel.com> >> CC: Michal Simek <monstr@monstr.eu> >> CC: Ralf Baechle <ralf@linux-mips.org> >> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> >> CC: Paul Mackerras <paulus@samba.org> >> CC: Michael Ellerman <mpe@ellerman.id.au> >> CC: Sebastian Ott <sebott@linux.vnet.ibm.com> >> CC: Gerald Schaefer <gerald.schaefer@de.ibm.com> >> CC: "David S. Miller" <davem@davemloft.net> >> CC: Chris Metcalf <cmetcalf@ezchip.com> >> CC: Thomas Gleixner <tglx@linutronix.de> >> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> >> CC: linux-alpha@vger.kernel.org >> CC: linux-kernel@vger.kernel.org >> CC: linux-ia64@vger.kernel.org >> CC: linux-mips@linux-mips.org >> CC: linuxppc-dev@lists.ozlabs.org >> CC: linux-s390@vger.kernel.org >> CC: linux-sh@vger.kernel.org >> CC: sparclinux@vger.kernel.org >> CC: xen-devel@lists.xenproject.org >> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >> --- >> arch/alpha/kernel/pci.c | 5 +++-- >> arch/alpha/kernel/sys_nautilus.c | 4 ++-- >> arch/ia64/pci/pci.c | 4 ++-- >> arch/ia64/sn/kernel/io_init.c | 5 +++-- >> arch/microblaze/pci/pci-common.c | 5 +++-- >> arch/mips/pci/pci.c | 4 ++-- >> arch/powerpc/kernel/pci-common.c | 5 +++-- >> arch/s390/pci/pci.c | 5 +++-- >> arch/sh/drivers/pci/pci.c | 5 +++-- >> arch/sparc/kernel/pci.c | 5 +++-- >> arch/tile/kernel/pci.c | 5 +++-- >> arch/tile/kernel/pci_gx.c | 5 +++-- >> arch/x86/pci/acpi.c | 7 ++++--- >> arch/x86/pci/common.c | 3 ++- >> drivers/pci/xen-pcifront.c | 5 +++-- >> 15 files changed, 42 insertions(+), 30 deletions(-) >> >> diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c >> index 5c845ad..deb0a36 100644 >> --- a/arch/alpha/kernel/pci.c >> +++ b/arch/alpha/kernel/pci.c >> @@ -336,8 +336,9 @@ common_init_pci(void) >> pci_add_resource_offset(&resources, hose->mem_space, >> hose->mem_space->start); >> >> - bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops, >> - hose, &resources); >> + bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(hose->index, next_busno), >> + alpha_mv.pci_ops, hose, &resources); >> if (!bus) >> continue; >> hose->bus = bus; >> diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c >> index 700686d..be0bbeb 100644 >> --- a/arch/alpha/kernel/sys_nautilus.c >> +++ b/arch/alpha/kernel/sys_nautilus.c >> @@ -206,10 +206,10 @@ nautilus_init_pci(void) >> unsigned long memtop = max_low_pfn << PAGE_SHIFT; >> >> /* Scan our single hose. */ >> - bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); >> + bus = pci_scan_bus(PCI_DOMBUS(hose->index, 0), >> + alpha_mv.pci_ops, hose); >> if (!bus) >> return; >> - >> hose->bus = bus; >> pcibios_claim_one_bus(bus); >> >> diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c >> index 48cc657..675749f 100644 >> --- a/arch/ia64/pci/pci.c >> +++ b/arch/ia64/pci/pci.c >> @@ -465,8 +465,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) >> * should handle the case here, but it appears that IA64 hasn't >> * such quirk. So we just ignore the case now. >> */ >> - pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller, >> - &info->resources); >> + pbus = pci_create_root_bus(NULL, PCI_DOMBUS(domain, bus), >> + &pci_root_ops, controller, &info->resources); >> if (!pbus) { >> pci_free_resource_list(&info->resources); >> __release_pci_root_info(info); >> diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c >> index 1be65eb..7e0b7f9 100644 >> --- a/arch/ia64/sn/kernel/io_init.c >> +++ b/arch/ia64/sn/kernel/io_init.c >> @@ -266,8 +266,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) >> pci_add_resource_offset(&resources, &res[1], >> prom_bussoft_ptr->bs_legacy_mem); >> >> - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, >> - &resources); >> + bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(controller->segment, busnum), >> + &pci_root_ops, controller, &resources); >> if (bus == NULL) { >> kfree(res); >> kfree(controller); >> diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c >> index 6d8d173..34a32ec 100644 >> --- a/arch/microblaze/pci/pci-common.c >> +++ b/arch/microblaze/pci/pci-common.c >> @@ -1350,8 +1350,9 @@ static void pcibios_scan_phb(struct pci_controller *hose) >> >> pcibios_setup_phb_resources(hose, &resources); >> >> - bus = pci_scan_root_bus(hose->parent, hose->first_busno, >> - hose->ops, hose, &resources); >> + bus = pci_scan_root_bus(hose->parent, >> + PCI_DOMBUS(hose->global_number, hose->first_busno), >> + hose->ops, hose, &resources); >> if (bus == NULL) { >> pr_err("Failed to create bus for PCI domain %04x\n", >> hose->global_number); >> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c >> index 9eb54b5..86f8d2b 100644 >> --- a/arch/mips/pci/pci.c >> +++ b/arch/mips/pci/pci.c >> @@ -92,8 +92,8 @@ static void pcibios_scanbus(struct pci_controller *hose) >> pci_add_resource_offset(&resources, >> hose->mem_resource, hose->mem_offset); >> pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset); >> - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, >> - &resources); >> + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(hose->index, next_busno), >> + hose->pci_ops, hose, &resources); >> if (!bus) >> pci_free_resource_list(&resources); >> >> diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c >> index 2a525c9..a467aca 100644 >> --- a/arch/powerpc/kernel/pci-common.c >> +++ b/arch/powerpc/kernel/pci-common.c >> @@ -1612,8 +1612,9 @@ void pcibios_scan_phb(struct pci_controller *hose) >> pci_add_resource(&resources, &hose->busn); >> >> /* Create an empty bus for the toplevel */ >> - bus = pci_create_root_bus(hose->parent, hose->first_busno, >> - hose->ops, hose, &resources); >> + bus = pci_create_root_bus(hose->parent, >> + PCI_DOMBUS(hose->global_number, hose->first_busno), >> + hose->ops, hose, &resources); >> if (bus == NULL) { >> pr_err("Failed to create bus for PCI domain %04x\n", >> hose->global_number); >> diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c >> index a2a7391..20e662f 100644 >> --- a/arch/s390/pci/pci.c >> +++ b/arch/s390/pci/pci.c >> @@ -770,8 +770,9 @@ static int zpci_scan_bus(struct zpci_dev *zdev) >> if (ret) >> return ret; >> >> - zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops, >> - zdev, &resources); >> + zdev->bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(zdev->domain, ZPCI_BUS_NR), &pci_root_ops, >> + zdev, &resources); >> if (!zdev->bus) { >> zpci_cleanup_bus_resources(zdev); >> return -EIO; >> diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c >> index efc1051..116f80f 100644 >> --- a/arch/sh/drivers/pci/pci.c >> +++ b/arch/sh/drivers/pci/pci.c >> @@ -52,8 +52,9 @@ static void pcibios_scanbus(struct pci_channel *hose) >> pci_add_resource_offset(&resources, res, offset); >> } >> >> - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, >> - &resources); >> + bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(hose->index, next_busno), >> + hose->pci_ops, hose, &resources); >> hose->bus = bus; >> >> need_domain_info = need_domain_info || hose->index; >> diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c >> index 9ce5afe..838fe1e 100644 >> --- a/arch/sparc/kernel/pci.c >> +++ b/arch/sparc/kernel/pci.c >> @@ -667,8 +667,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, >> pbm->busn.end = pbm->pci_last_busno; >> pbm->busn.flags = IORESOURCE_BUS; >> pci_add_resource(&resources, &pbm->busn); >> - bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops, >> - pbm, &resources); >> + bus = pci_create_root_bus(parent, >> + PCI_DOMBUS(pbm->index, pbm->pci_first_busno), >> + pbm->pci_ops, pbm, &resources); >> if (!bus) { >> printk(KERN_ERR "Failed to create bus for %s\n", >> node->full_name); >> diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c >> index 9475a74..25b0d9b 100644 >> --- a/arch/tile/kernel/pci.c >> +++ b/arch/tile/kernel/pci.c >> @@ -306,8 +306,9 @@ int __init pcibios_init(void) >> >> pci_add_resource(&resources, &ioport_resource); >> pci_add_resource(&resources, &iomem_resource); >> - bus = pci_scan_root_bus(NULL, 0, controller->ops, >> - controller, &resources); >> + bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(controller->index, 0), >> + controller->ops, controller, &resources); >> controller->root_bus = bus; >> controller->last_busno = bus->busn_res.end; >> } >> diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c >> index b1df847..f6f41f3 100644 >> --- a/arch/tile/kernel/pci_gx.c >> +++ b/arch/tile/kernel/pci_gx.c >> @@ -881,8 +881,9 @@ int __init pcibios_init(void) >> controller->mem_offset); >> pci_add_resource(&resources, &controller->io_space); >> controller->first_busno = next_busno; >> - bus = pci_scan_root_bus(NULL, next_busno, controller->ops, >> - controller, &resources); >> + bus = pci_scan_root_bus(NULL, >> + PCI_DOMBUS(controller->index, next_busno), >> + controller->ops, controller, &resources); >> controller->root_bus = bus; >> next_busno = bus->busn_res.end + 1; >> } >> diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c >> index 6ac2738..ad0e926 100644 >> --- a/arch/x86/pci/acpi.c >> +++ b/arch/x86/pci/acpi.c >> @@ -424,9 +424,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) >> } >> >> if (!setup_mcfg_map(info, domain, (u8)root->secondary.start, >> - (u8)root->secondary.end, root->mcfg_addr)) >> - bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, >> - sd, &resources); >> + (u8)root->secondary.end, root->mcfg_addr)) >> + bus = pci_create_root_bus(NULL, >> + PCI_DOMBUS(domain, busnum), &pci_root_ops, >> + sd, &resources); >> >> if (bus) { >> pci_scan_child_bus(bus); >> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c >> index 0cbc723..0160280 100644 >> --- a/arch/x86/pci/common.c >> +++ b/arch/x86/pci/common.c >> @@ -486,7 +486,8 @@ void pcibios_scan_root(int busnum) >> sd->node = x86_pci_root_bus_node(busnum); >> x86_pci_root_bus_resources(busnum, &resources); >> printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); >> - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); >> + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(0, busnum), >> + &pci_root_ops, sd, &resources); >> if (!bus) { >> pci_free_resource_list(&resources); >> kfree(sd); >> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c >> index 9e7c28b..af6144a 100644 >> --- a/drivers/pci/xen-pcifront.c >> +++ b/drivers/pci/xen-pcifront.c >> @@ -479,8 +479,9 @@ static int pcifront_scan_root(struct pcifront_device *pdev, >> >> pci_lock_rescan_remove(); >> >> - b = pci_scan_root_bus(&pdev->xdev->dev, bus, >> - &pcifront_bus_ops, sd, &resources); >> + b = pci_scan_root_bus(&pdev->xdev->dev, >> + PCI_DOMBUS(sd->domain, bus), >> + &pcifront_bus_ops, sd, &resources); >> if (!b) { >> dev_err(&pdev->xdev->dev, >> "Error creating PCI Frontend Bus!\n"); >> -- >> 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 > > . > -- Thanks! Yijing ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number 2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang 2015-03-12 1:34 ` Bjorn Helgaas @ 2015-03-17 5:15 ` Manish Jaggi 2015-03-17 14:05 ` Ian Campbell 1 sibling, 1 reply; 7+ messages in thread From: Manish Jaggi @ 2015-03-17 5:15 UTC (permalink / raw) To: Yijing Wang, Bjorn Helgaas Cc: linux-mips, linux-ia64, linux-sh, linux-pci, Chris Metcalf, Paul Mackerras, sparclinux, Guan Xuetao, linux-s390, Russell King, x86, Sebastian Ott, Geert Uytterhoeven, linux-arm-kernel, xen-devel, Matt Turner, Fenghua Yu, Arnd Bergmann, Marc Zyngier, Rusty Russell, linux-m68k, Ivan Kokshaysky, Thomas Gleixner, Yinghai Lu, Gerald Schaefer, Richard Henderson, Liviu Dudau, Michal Simek, Tony Luck, linux-kernel, Ralf Baechle, David S. Miller, linux-alpha, linuxppc-dev, Jiang Liu On Monday 09 March 2015 08:04 AM, Yijing Wang wrote: > Now we could pass PCI domain combined with bus number > in u32 argu. Because in arm/arm64, PCI domain number > is assigned by pci_bus_assign_domain_nr(). So we leave > pci_scan_root_bus() and pci_create_root_bus() in arm/arm64 > unchanged. A new function pci_host_assign_domain_nr() > will be introduced for arm/arm64 to assign domain number > in later patch. Hi, I think these changes might not be required. We have made very few changes in the xen-pcifront to support PCI passthrough in arm64. As per xen architecture for a domU only a single pci virtual bus is created and all passthrough devices are attached to it. -manish > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > CC: Richard Henderson <rth@twiddle.net> > CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > CC: Matt Turner <mattst88@gmail.com> > CC: Tony Luck <tony.luck@intel.com> > CC: Fenghua Yu <fenghua.yu@intel.com> > CC: Michal Simek <monstr@monstr.eu> > CC: Ralf Baechle <ralf@linux-mips.org> > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> > CC: Paul Mackerras <paulus@samba.org> > CC: Michael Ellerman <mpe@ellerman.id.au> > CC: Sebastian Ott <sebott@linux.vnet.ibm.com> > CC: Gerald Schaefer <gerald.schaefer@de.ibm.com> > CC: "David S. Miller" <davem@davemloft.net> > CC: Chris Metcalf <cmetcalf@ezchip.com> > CC: Thomas Gleixner <tglx@linutronix.de> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > CC: linux-alpha@vger.kernel.org > CC: linux-kernel@vger.kernel.org > CC: linux-ia64@vger.kernel.org > CC: linux-mips@linux-mips.org > CC: linuxppc-dev@lists.ozlabs.org > CC: linux-s390@vger.kernel.org > CC: linux-sh@vger.kernel.org > CC: sparclinux@vger.kernel.org > CC: xen-devel@lists.xenproject.org > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/alpha/kernel/pci.c | 5 +++-- > arch/alpha/kernel/sys_nautilus.c | 4 ++-- > arch/ia64/pci/pci.c | 4 ++-- > arch/ia64/sn/kernel/io_init.c | 5 +++-- > arch/microblaze/pci/pci-common.c | 5 +++-- > arch/mips/pci/pci.c | 4 ++-- > arch/powerpc/kernel/pci-common.c | 5 +++-- > arch/s390/pci/pci.c | 5 +++-- > arch/sh/drivers/pci/pci.c | 5 +++-- > arch/sparc/kernel/pci.c | 5 +++-- > arch/tile/kernel/pci.c | 5 +++-- > arch/tile/kernel/pci_gx.c | 5 +++-- > arch/x86/pci/acpi.c | 7 ++++--- > arch/x86/pci/common.c | 3 ++- > drivers/pci/xen-pcifront.c | 5 +++-- > 15 files changed, 42 insertions(+), 30 deletions(-) > > diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c > index 5c845ad..deb0a36 100644 > --- a/arch/alpha/kernel/pci.c > +++ b/arch/alpha/kernel/pci.c > @@ -336,8 +336,9 @@ common_init_pci(void) > pci_add_resource_offset(&resources, hose->mem_space, > hose->mem_space->start); > > - bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops, > - hose, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(hose->index, next_busno), > + alpha_mv.pci_ops, hose, &resources); > if (!bus) > continue; > hose->bus = bus; > diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c > index 700686d..be0bbeb 100644 > --- a/arch/alpha/kernel/sys_nautilus.c > +++ b/arch/alpha/kernel/sys_nautilus.c > @@ -206,10 +206,10 @@ nautilus_init_pci(void) > unsigned long memtop = max_low_pfn << PAGE_SHIFT; > > /* Scan our single hose. */ > - bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); > + bus = pci_scan_bus(PCI_DOMBUS(hose->index, 0), > + alpha_mv.pci_ops, hose); > if (!bus) > return; > - > hose->bus = bus; > pcibios_claim_one_bus(bus); > > diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c > index 48cc657..675749f 100644 > --- a/arch/ia64/pci/pci.c > +++ b/arch/ia64/pci/pci.c > @@ -465,8 +465,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) > * should handle the case here, but it appears that IA64 hasn't > * such quirk. So we just ignore the case now. > */ > - pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller, > - &info->resources); > + pbus = pci_create_root_bus(NULL, PCI_DOMBUS(domain, bus), > + &pci_root_ops, controller, &info->resources); > if (!pbus) { > pci_free_resource_list(&info->resources); > __release_pci_root_info(info); > diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c > index 1be65eb..7e0b7f9 100644 > --- a/arch/ia64/sn/kernel/io_init.c > +++ b/arch/ia64/sn/kernel/io_init.c > @@ -266,8 +266,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) > pci_add_resource_offset(&resources, &res[1], > prom_bussoft_ptr->bs_legacy_mem); > > - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, > - &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->segment, busnum), > + &pci_root_ops, controller, &resources); > if (bus == NULL) { > kfree(res); > kfree(controller); > diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c > index 6d8d173..34a32ec 100644 > --- a/arch/microblaze/pci/pci-common.c > +++ b/arch/microblaze/pci/pci-common.c > @@ -1350,8 +1350,9 @@ static void pcibios_scan_phb(struct pci_controller *hose) > > pcibios_setup_phb_resources(hose, &resources); > > - bus = pci_scan_root_bus(hose->parent, hose->first_busno, > - hose->ops, hose, &resources); > + bus = pci_scan_root_bus(hose->parent, > + PCI_DOMBUS(hose->global_number, hose->first_busno), > + hose->ops, hose, &resources); > if (bus == NULL) { > pr_err("Failed to create bus for PCI domain %04x\n", > hose->global_number); > diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c > index 9eb54b5..86f8d2b 100644 > --- a/arch/mips/pci/pci.c > +++ b/arch/mips/pci/pci.c > @@ -92,8 +92,8 @@ static void pcibios_scanbus(struct pci_controller *hose) > pci_add_resource_offset(&resources, > hose->mem_resource, hose->mem_offset); > pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset); > - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, > - &resources); > + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(hose->index, next_busno), > + hose->pci_ops, hose, &resources); > if (!bus) > pci_free_resource_list(&resources); > > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index 2a525c9..a467aca 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -1612,8 +1612,9 @@ void pcibios_scan_phb(struct pci_controller *hose) > pci_add_resource(&resources, &hose->busn); > > /* Create an empty bus for the toplevel */ > - bus = pci_create_root_bus(hose->parent, hose->first_busno, > - hose->ops, hose, &resources); > + bus = pci_create_root_bus(hose->parent, > + PCI_DOMBUS(hose->global_number, hose->first_busno), > + hose->ops, hose, &resources); > if (bus == NULL) { > pr_err("Failed to create bus for PCI domain %04x\n", > hose->global_number); > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c > index a2a7391..20e662f 100644 > --- a/arch/s390/pci/pci.c > +++ b/arch/s390/pci/pci.c > @@ -770,8 +770,9 @@ static int zpci_scan_bus(struct zpci_dev *zdev) > if (ret) > return ret; > > - zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops, > - zdev, &resources); > + zdev->bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(zdev->domain, ZPCI_BUS_NR), &pci_root_ops, > + zdev, &resources); > if (!zdev->bus) { > zpci_cleanup_bus_resources(zdev); > return -EIO; > diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c > index efc1051..116f80f 100644 > --- a/arch/sh/drivers/pci/pci.c > +++ b/arch/sh/drivers/pci/pci.c > @@ -52,8 +52,9 @@ static void pcibios_scanbus(struct pci_channel *hose) > pci_add_resource_offset(&resources, res, offset); > } > > - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, > - &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(hose->index, next_busno), > + hose->pci_ops, hose, &resources); > hose->bus = bus; > > need_domain_info = need_domain_info || hose->index; > diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c > index 9ce5afe..838fe1e 100644 > --- a/arch/sparc/kernel/pci.c > +++ b/arch/sparc/kernel/pci.c > @@ -667,8 +667,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, > pbm->busn.end = pbm->pci_last_busno; > pbm->busn.flags = IORESOURCE_BUS; > pci_add_resource(&resources, &pbm->busn); > - bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops, > - pbm, &resources); > + bus = pci_create_root_bus(parent, > + PCI_DOMBUS(pbm->index, pbm->pci_first_busno), > + pbm->pci_ops, pbm, &resources); > if (!bus) { > printk(KERN_ERR "Failed to create bus for %s\n", > node->full_name); > diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c > index 9475a74..25b0d9b 100644 > --- a/arch/tile/kernel/pci.c > +++ b/arch/tile/kernel/pci.c > @@ -306,8 +306,9 @@ int __init pcibios_init(void) > > pci_add_resource(&resources, &ioport_resource); > pci_add_resource(&resources, &iomem_resource); > - bus = pci_scan_root_bus(NULL, 0, controller->ops, > - controller, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->index, 0), > + controller->ops, controller, &resources); > controller->root_bus = bus; > controller->last_busno = bus->busn_res.end; > } > diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c > index b1df847..f6f41f3 100644 > --- a/arch/tile/kernel/pci_gx.c > +++ b/arch/tile/kernel/pci_gx.c > @@ -881,8 +881,9 @@ int __init pcibios_init(void) > controller->mem_offset); > pci_add_resource(&resources, &controller->io_space); > controller->first_busno = next_busno; > - bus = pci_scan_root_bus(NULL, next_busno, controller->ops, > - controller, &resources); > + bus = pci_scan_root_bus(NULL, > + PCI_DOMBUS(controller->index, next_busno), > + controller->ops, controller, &resources); > controller->root_bus = bus; > next_busno = bus->busn_res.end + 1; > } > diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c > index 6ac2738..ad0e926 100644 > --- a/arch/x86/pci/acpi.c > +++ b/arch/x86/pci/acpi.c > @@ -424,9 +424,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) > } > > if (!setup_mcfg_map(info, domain, (u8)root->secondary.start, > - (u8)root->secondary.end, root->mcfg_addr)) > - bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, > - sd, &resources); > + (u8)root->secondary.end, root->mcfg_addr)) > + bus = pci_create_root_bus(NULL, > + PCI_DOMBUS(domain, busnum), &pci_root_ops, > + sd, &resources); > > if (bus) { > pci_scan_child_bus(bus); > diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c > index 0cbc723..0160280 100644 > --- a/arch/x86/pci/common.c > +++ b/arch/x86/pci/common.c > @@ -486,7 +486,8 @@ void pcibios_scan_root(int busnum) > sd->node = x86_pci_root_bus_node(busnum); > x86_pci_root_bus_resources(busnum, &resources); > printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); > - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources); > + bus = pci_scan_root_bus(NULL, PCI_DOMBUS(0, busnum), > + &pci_root_ops, sd, &resources); > if (!bus) { > pci_free_resource_list(&resources); > kfree(sd); > diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c > index 9e7c28b..af6144a 100644 > --- a/drivers/pci/xen-pcifront.c > +++ b/drivers/pci/xen-pcifront.c > @@ -479,8 +479,9 @@ static int pcifront_scan_root(struct pcifront_device *pdev, > > pci_lock_rescan_remove(); > > - b = pci_scan_root_bus(&pdev->xdev->dev, bus, > - &pcifront_bus_ops, sd, &resources); > + b = pci_scan_root_bus(&pdev->xdev->dev, > + PCI_DOMBUS(sd->domain, bus), > + &pcifront_bus_ops, sd, &resources); > if (!b) { > dev_err(&pdev->xdev->dev, > "Error creating PCI Frontend Bus!\n"); ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Xen-devel] [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number 2015-03-17 5:15 ` [Xen-devel] " Manish Jaggi @ 2015-03-17 14:05 ` Ian Campbell 0 siblings, 0 replies; 7+ messages in thread From: Ian Campbell @ 2015-03-17 14:05 UTC (permalink / raw) To: Manish Jaggi Cc: linux-mips, linux-ia64, linux-sh, linux-pci, Yijing Wang, Chris Metcalf, Paul Mackerras, sparclinux, Guan Xuetao, linux-s390, Russell King, x86, Sebastian Ott, Geert Uytterhoeven, Gerald Schaefer, xen-devel, Matt Turner, Fenghua Yu, Arnd Bergmann, Marc Zyngier, Rusty Russell, linux-m68k, Ivan Kokshaysky, Bjorn Helgaas, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Richard Henderson, Liviu Dudau, Michal Simek, Tony Luck, linux-kernel, Ralf Baechle, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller On Tue, 2015-03-17 at 10:45 +0530, Manish Jaggi wrote: > On Monday 09 March 2015 08:04 AM, Yijing Wang wrote: > > Now we could pass PCI domain combined with bus number > > in u32 argu. Because in arm/arm64, PCI domain number > > is assigned by pci_bus_assign_domain_nr(). So we leave > > pci_scan_root_bus() and pci_create_root_bus() in arm/arm64 > > unchanged. A new function pci_host_assign_domain_nr() > > will be introduced for arm/arm64 to assign domain number > > in later patch. > Hi, > I think these changes might not be required. We have made very few > changes in the xen-pcifront to support PCI passthrough in arm64. > As per xen architecture for a domU only a single pci virtual bus is > created and all passthrough devices are attached to it. I guess you are only talking about the changes to xen-pcifront.c? Otherwise you are ignoring the dom0 case which is exposed to the real set of PCI root complexes and anyway I'm not sure how "not needed for Xen domU" translates into not required, since it is clearly required for other systems. Strictly speaking the Xen pciif protocol does support multiple buses, it's just that the tools, and perhaps kernels, have not yet felt any need to actually make use of that. There doesn't seem to be any harm in updating pcifront to follow this generic API change. Ian. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v6 16/30] powerpc/pci: Rename pcibios_root_bridge_prepare() [not found] <1425868467-9667-1-git-send-email-wangyijing@huawei.com> 2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang @ 2015-03-09 2:34 ` Yijing Wang 2015-03-09 2:34 ` [PATCH v6 17/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang 2 siblings, 0 replies; 7+ messages in thread From: Yijing Wang @ 2015-03-09 2:34 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-ia64, linux-pci, Yijing Wang, Guan Xuetao, Russell King, x86, Geert Uytterhoeven, Arnd Bergmann, Marc Zyngier, Rusty Russell, linux-m68k, Bjorn Helgaas, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Liviu Dudau, Tony Luck, linux-kernel, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller Pcibios_root_bridge_prepare() in powerpc is used to set root bus speed. Rename it to pcibios_set_root_bus_speed() for better readability. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/kernel/pci-common.c | 4 ++-- arch/powerpc/platforms/pseries/pci.c | 2 +- arch/powerpc/platforms/pseries/pseries.h | 2 +- arch/powerpc/platforms/pseries/setup.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index c8175a3..8e7f2a8 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -129,7 +129,7 @@ struct machdep_calls { void (*pcibios_fixup)(void); int (*pci_probe_mode)(struct pci_bus *); void (*pci_irq_fixup)(struct pci_dev *dev); - int (*pcibios_root_bridge_prepare)(struct pci_host_bridge + int (*pcibios_set_root_bus_speed)(struct pci_host_bridge *bridge); /* To setup PHBs when using automatic OF platform driver for PCI */ diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index a467aca..0d8b369 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -769,8 +769,8 @@ int pci_proc_domain(struct pci_bus *bus) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - if (ppc_md.pcibios_root_bridge_prepare) - return ppc_md.pcibios_root_bridge_prepare(bridge); + if (ppc_md.pcibios_set_root_bus_speed) + return ppc_md.pcibios_set_root_bus_speed(bridge); return 0; } diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c index fe16a50..af685d6 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -110,7 +110,7 @@ static void fixup_winbond_82c105(struct pci_dev* dev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, fixup_winbond_82c105); -int pseries_root_bridge_prepare(struct pci_host_bridge *bridge) +int pseries_set_root_bus_speed(struct pci_host_bridge *bridge) { struct device_node *dn, *pdn; struct pci_bus *bus; diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 1796c54..5d0be3a 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -63,7 +63,7 @@ extern int dlpar_detach_node(struct device_node *); /* PCI root bridge prepare function override for pseries */ struct pci_host_bridge; -int pseries_root_bridge_prepare(struct pci_host_bridge *bridge); +int pseries_set_root_bus_speed(struct pci_host_bridge *bridge); unsigned long pseries_memory_block_size(void); diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index e445b67..b196c0d 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -496,7 +496,7 @@ static void __init pSeries_setup_arch(void) ppc_md.enable_pmcs = power4_enable_pmcs; } - ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare; + ppc_md.pcibios_set_root_bus_speed = pseries_set_root_bus_speed; if (firmware_has_feature(FW_FEATURE_SET_MODE)) { long rc; -- 1.7.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v6 17/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity [not found] <1425868467-9667-1-git-send-email-wangyijing@huawei.com> 2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang 2015-03-09 2:34 ` [PATCH v6 16/30] powerpc/pci: Rename pcibios_root_bridge_prepare() Yijing Wang @ 2015-03-09 2:34 ` Yijing Wang 2 siblings, 0 replies; 7+ messages in thread From: Yijing Wang @ 2015-03-09 2:34 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-ia64, linux-pci, Yijing Wang, Guan Xuetao, Russell King, x86, Geert Uytterhoeven, Arnd Bergmann, Marc Zyngier, Rusty Russell, linux-m68k, Bjorn Helgaas, Thomas Gleixner, Yinghai Lu, linux-arm-kernel, Liviu Dudau, Tony Luck, linux-kernel, Jiang Liu, linux-alpha, linuxppc-dev, David S. Miller Now we could use pci_scan_host_bridge() to scan pci buses, provide powerpc specific pci_host_bridge_ops. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/kernel/pci-common.c | 63 +++++++++++++++++------------ arch/powerpc/platforms/pseries/pci.c | 8 ++-- arch/powerpc/platforms/pseries/pseries.h | 2 +- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 8e7f2a8..b811d12 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -129,7 +129,7 @@ struct machdep_calls { void (*pcibios_fixup)(void); int (*pci_probe_mode)(struct pci_bus *); void (*pci_irq_fixup)(struct pci_dev *dev); - int (*pcibios_set_root_bus_speed)(struct pci_host_bridge + void (*pcibios_set_root_bus_speed)(struct pci_host_bridge *bridge); /* To setup PHBs when using automatic OF platform driver for PCI */ diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 0d8b369..74cbb5d 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -767,14 +767,35 @@ int pci_proc_domain(struct pci_bus *bus) return 1; } -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +static void pci_host_bridge_set_root_bus_speed( + struct pci_host_bridge *bridge) { if (ppc_md.pcibios_set_root_bus_speed) - return ppc_md.pcibios_set_root_bus_speed(bridge); + ppc_md.pcibios_set_root_bus_speed(bridge); +} - return 0; +static void pci_host_bridge_of_scan_bus(struct pci_host_bridge *host) +{ + int mode = PCI_PROBE_NORMAL; + struct pci_bus *bus = host->bus; + struct pci_controller *hose = dev_get_drvdata(&host->dev); + + /* Get probe mode and perform scan */ + if (hose->dn && ppc_md.pci_probe_mode) + mode = ppc_md.pci_probe_mode(bus); + + pr_debug(" probe mode: %d\n", mode); + if (mode == PCI_PROBE_DEVTREE) + of_scan_bus(hose->dn, bus); + + if (mode == PCI_PROBE_NORMAL) { + pci_bus_update_busn_res_end(bus, 255); + hose->last_busno = pci_scan_child_bus(bus); + pci_bus_update_busn_res_end(bus, hose->last_busno); + } } + /* This header fixup will do the resource fixup for all devices as they are * probed, but not for bridge ranges */ @@ -1587,6 +1608,11 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus) return of_node_get(hose->dn); } +static struct pci_host_bridge_ops phb_ops = { + .set_root_bus_speed = pci_host_bridge_set_root_bus_speed, + .scan_bus = pci_host_bridge_of_scan_bus, +}; + /** * pci_scan_phb - Given a pci_controller, setup and scan the PCI bus * @hose: Pointer to the PCI host controller instance structure @@ -1594,9 +1620,8 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus) void pcibios_scan_phb(struct pci_controller *hose) { LIST_HEAD(resources); - struct pci_bus *bus; + struct pci_host_bridge *host; struct device_node *node = hose->dn; - int mode; pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node)); @@ -1612,30 +1637,16 @@ void pcibios_scan_phb(struct pci_controller *hose) pci_add_resource(&resources, &hose->busn); /* Create an empty bus for the toplevel */ - bus = pci_create_root_bus(hose->parent, + host = pci_scan_host_bridge(hose->parent, PCI_DOMBUS(hose->global_number, hose->first_busno), - hose->ops, hose, &resources); - if (bus == NULL) { - pr_err("Failed to create bus for PCI domain %04x\n", + hose->ops, hose, &resources, &phb_ops); + if (host == NULL) { + pr_err("Failed to create host bridge for PCI domain %04x\n", hose->global_number); pci_free_resource_list(&resources); return; } - hose->bus = bus; - - /* Get probe mode and perform scan */ - mode = PCI_PROBE_NORMAL; - if (node && ppc_md.pci_probe_mode) - mode = ppc_md.pci_probe_mode(bus); - pr_debug(" probe mode: %d\n", mode); - if (mode == PCI_PROBE_DEVTREE) - of_scan_bus(node, bus); - - if (mode == PCI_PROBE_NORMAL) { - pci_bus_update_busn_res_end(bus, 255); - hose->last_busno = pci_scan_child_bus(bus); - pci_bus_update_busn_res_end(bus, hose->last_busno); - } + hose->bus = host->bus; /* Platform gets a chance to do some global fixups before * we proceed to resource allocation @@ -1644,9 +1655,9 @@ void pcibios_scan_phb(struct pci_controller *hose) ppc_md.pcibios_fixup_phb(hose); /* Configure PCI Express settings */ - if (bus && !pci_has_flag(PCI_PROBE_ONLY)) { + if (host->bus && !pci_has_flag(PCI_PROBE_ONLY)) { struct pci_bus *child; - list_for_each_entry(child, &bus->children, node) + list_for_each_entry(child, &host->bus->children, node) pcie_bus_configure_settings(child); } } diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c index af685d6..89ff79c 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -110,7 +110,7 @@ static void fixup_winbond_82c105(struct pci_dev* dev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, fixup_winbond_82c105); -int pseries_set_root_bus_speed(struct pci_host_bridge *bridge) +void pseries_set_root_bus_speed(struct pci_host_bridge *bridge) { struct device_node *dn, *pdn; struct pci_bus *bus; @@ -121,7 +121,7 @@ int pseries_set_root_bus_speed(struct pci_host_bridge *bridge) dn = pcibios_get_phb_of_node(bus); if (!dn) - return 0; + return; for (pdn = dn; pdn != NULL; pdn = of_get_next_parent(pdn)) { rc = of_property_read_u32_array(pdn, @@ -135,7 +135,7 @@ int pseries_set_root_bus_speed(struct pci_host_bridge *bridge) if (rc) { pr_debug("no ibm,pcie-link-speed-stats property\n"); - return 0; + return; } switch (pcie_link_speed_stats[0]) { @@ -168,5 +168,5 @@ int pseries_set_root_bus_speed(struct pci_host_bridge *bridge) break; } - return 0; + return; } diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 5d0be3a..9aa9c13 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -63,7 +63,7 @@ extern int dlpar_detach_node(struct device_node *); /* PCI root bridge prepare function override for pseries */ struct pci_host_bridge; -int pseries_set_root_bus_speed(struct pci_host_bridge *bridge); +void pseries_set_root_bus_speed(struct pci_host_bridge *bridge); unsigned long pseries_memory_block_size(void); -- 1.7.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-17 14:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1425868467-9667-1-git-send-email-wangyijing@huawei.com>
2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang
2015-03-12 1:34 ` Bjorn Helgaas
2015-03-12 12:20 ` Yijing Wang
2015-03-17 5:15 ` [Xen-devel] " Manish Jaggi
2015-03-17 14:05 ` Ian Campbell
2015-03-09 2:34 ` [PATCH v6 16/30] powerpc/pci: Rename pcibios_root_bridge_prepare() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 17/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).