* [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h Yijing Wang ` (10 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Save domain in pci_host_bridge, so we could get domain from pci_host_bridge, and at the end of series, we could clean up the arch specific pci_domain_nr(). For arm/arm64, the domain argument is pointless, because they enable CONFIG_PCI_DOMAINS_GENERIC, PCI core would assign domain number for them, so introduce pci_create_root_bus_generic and pci_scan_root_bus_generic() which simply assign domain number to -1. Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> #mvebu part Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/alpha/kernel/pci.c | 4 ++-- arch/alpha/kernel/sys_nautilus.c | 2 +- arch/arm/kernel/bios32.c | 2 +- arch/arm/mach-dove/pcie.c | 2 +- arch/arm/mach-iop13xx/pci.c | 4 ++-- arch/arm/mach-mv78xx0/pcie.c | 2 +- arch/arm/mach-orion5x/pci.c | 4 ++-- arch/frv/mb93090-mb00/pci-vdk.c | 3 ++- arch/ia64/pci/pci.c | 4 ++-- arch/ia64/sn/kernel/io_init.c | 4 ++-- arch/m68k/coldfire/pci.c | 2 +- arch/microblaze/pci/pci-common.c | 4 ++-- arch/mips/pci/pci.c | 4 ++-- arch/mn10300/unit-asb2305/pci.c | 3 ++- arch/powerpc/kernel/pci-common.c | 4 ++-- arch/s390/pci/pci.c | 4 ++-- arch/sh/drivers/pci/pci.c | 4 ++-- arch/sparc/kernel/leon_pci.c | 2 +- arch/sparc/kernel/pci.c | 4 ++-- arch/sparc/kernel/pcic.c | 2 +- arch/tile/kernel/pci.c | 4 ++-- arch/tile/kernel/pci_gx.c | 4 ++-- arch/unicore32/kernel/pci.c | 2 +- arch/x86/pci/acpi.c | 4 ++-- arch/x86/pci/common.c | 2 +- arch/xtensa/kernel/pci.c | 2 +- drivers/parisc/dino.c | 2 +- drivers/parisc/lba_pci.c | 2 +- drivers/pci/host/pci-versatile.c | 3 ++- drivers/pci/host/pci-xgene.c | 2 +- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/host/pcie-iproc.c | 2 +- drivers/pci/host/pcie-xilinx.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 2 +- drivers/pci/probe.c | 21 +++++++++++++-------- drivers/pci/xen-pcifront.c | 2 +- include/linux/pci.h | 20 +++++++++++++++++--- 37 files changed, 82 insertions(+), 60 deletions(-) diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 82f738e..2b0bce9 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -336,8 +336,8 @@ 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, 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 2cfaa0e..5d4f56f 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -205,7 +205,7 @@ 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(hose->index, 0, alpha_mv.pci_ops, hose); if (!bus) return; diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index fcbbbb1..c7919c5 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -486,7 +486,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, if (hw->scan) sys->bus = hw->scan(nr, sys); else - sys->bus = pci_scan_root_bus(parent, sys->busnr, + sys->bus = pci_scan_root_bus_generic(parent, sys->busnr, hw->ops, sys, &sys->resources); if (!sys->bus) diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 91fe971..2bbdd3f 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -160,7 +160,7 @@ dove_pcie_scan_bus(int nr, struct pci_sys_data *sys) return NULL; } - return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, + return pci_scan_root_bus_generic(NULL, sys->busnr, &pcie_ops, sys, &sys->resources); } diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c index 9082b84..0b60464 100644 --- a/arch/arm/mach-iop13xx/pci.c +++ b/arch/arm/mach-iop13xx/pci.c @@ -535,12 +535,12 @@ struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *sys) while(time_before(jiffies, atux_trhfa_timeout)) udelay(100); - bus = pci_bus_atux = pci_scan_root_bus(NULL, sys->busnr, + bus = pci_bus_atux = pci_scan_root_bus_generic(NULL, sys->busnr, &iop13xx_atux_ops, sys, &sys->resources); break; case IOP13XX_INIT_ATU_ATUE: - bus = pci_bus_atue = pci_scan_root_bus(NULL, sys->busnr, + bus = pci_bus_atue = pci_scan_root_bus_generic(NULL, sys->busnr, &iop13xx_atue_ops, sys, &sys->resources); break; diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 097ea4c..d4d8718 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -202,7 +202,7 @@ mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys) return NULL; } - return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, + return pci_scan_root_bus_generic(NULL, sys->busnr, &pcie_ops, sys, &sys->resources); } diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index b02f394..c414059 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -558,11 +558,11 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys) { if (nr == 0) - return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, + return pci_scan_root_bus_generic(NULL, sys->busnr, &pcie_ops, sys, &sys->resources); if (nr == 1 && !orion5x_pci_disabled) - return pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys, + return pci_scan_root_bus_generic(NULL, sys->busnr, &pci_ops, sys, &sys->resources); BUG(); diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index f211839..719fb75 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c @@ -384,7 +384,8 @@ int __init pcibios_init(void) printk("PCI: Probing PCI hardware\n"); pci_add_resource(&resources, &pci_ioport_resource); pci_add_resource(&resources, &pci_iomem_resource); - bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources); + bus = pci_scan_root_bus(NULL, 0, 0, pci_root_ops, NULL, + &resources); pcibios_irq_init(); pcibios_fixup_irqs(); diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 7cc3be9..67ffe1f 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -462,8 +462,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, 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..d528814 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -266,8 +266,8 @@ 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, controller->segment, busnum, + &pci_root_ops, controller, &resources); if (bus == NULL) { kfree(res); kfree(controller); diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c index 821de92..63c0c2f 100644 --- a/arch/m68k/coldfire/pci.c +++ b/arch/m68k/coldfire/pci.c @@ -312,7 +312,7 @@ static int __init mcf_pci_init(void) set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(msecs_to_jiffies(200)); - rootbus = pci_scan_bus(0, &mcf_pci_ops, NULL); + rootbus = pci_scan_bus(0, 0, &mcf_pci_ops, NULL); if (!rootbus) return -ENODEV; diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index ae838ed..d232c8a 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -1350,8 +1350,8 @@ 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, 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 b8a0bf5..aead9d6 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -95,8 +95,8 @@ static void pcibios_scanbus(struct pci_controller *hose) hose->io_resource, hose->io_offset); pci_add_resource_offset(&resources, hose->busn_resource, hose->busn_offset); - bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, - &resources); + bus = pci_scan_root_bus(NULL, hose->index, next_busno, + hose->pci_ops, hose, &resources); hose->bus = bus; need_domain_info = need_domain_info || hose->index; diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index 3dfe2d3..a298172 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c @@ -372,7 +372,8 @@ static int __init pcibios_init(void) pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset); pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset); - bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources); + bus = pci_scan_root_bus(NULL, 0, 0, &pci_direct_ampci, + NULL, &resources); if (!bus) return 0; diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index b9de34d..df7f018 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1653,8 +1653,8 @@ 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, 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 598f023..b9ac2f5 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -779,8 +779,8 @@ 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, 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 d5462b7..293249a 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -52,8 +52,8 @@ 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, 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/leon_pci.c b/arch/sparc/kernel/leon_pci.c index 4371f72..36d702d 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c @@ -32,7 +32,7 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) info->busn.flags = IORESOURCE_BUS; pci_add_resource(&resources, &info->busn); - root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info, + root_bus = pci_scan_root_bus(&ofdev->dev, 0, 0, info->ops, info, &resources); if (!root_bus) { pci_free_resource_list(&resources); diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index c928bc6..1e957de 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -664,8 +664,8 @@ 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, 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/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 24384e1..7e86410 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -390,7 +390,7 @@ static void __init pcic_pbm_scan_bus(struct linux_pcic *pcic) { struct linux_pbm_info *pbm = &pcic->pbm; - pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno, &pcic_ops, pbm); + pbm->pci_bus = pci_scan_bus(0, pbm->pci_first_busno, &pcic_ops, pbm); if (!pbm->pci_bus) return; diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 9475a74..6ae0871 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -306,8 +306,8 @@ 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, 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..d47a698 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -881,8 +881,8 @@ 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, controller->index, next_busno, + controller->ops, controller, &resources); controller->root_bus = bus; next_busno = bus->busn_res.end + 1; } diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index d45fa5f..ef9be16 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -258,7 +258,7 @@ static int __init pci_common_init(void) pci_puv3_preinit(); - puv3_bus = pci_scan_bus(0, &pci_puv3_ops, NULL); + puv3_bus = pci_scan_bus(0, 0, &pci_puv3_ops, NULL); if (!puv3_bus) panic("PCI: unable to scan bus!"); diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index ff99117..629fc3b 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -463,8 +463,8 @@ 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); + bus = pci_create_root_bus(NULL, 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 8fd6f44..d50ac9b 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -486,7 +486,7 @@ 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, 0, busnum, &pci_root_ops, sd, &resources); if (!bus) { pci_free_resource_list(&resources); kfree(sd); diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index b848cc3..66da4c3 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c @@ -183,7 +183,7 @@ static int __init pcibios_init(void) pci_ctrl->last_busno = 0xff; INIT_LIST_HEAD(&resources); pci_controller_apertures(pci_ctrl, &resources); - bus = pci_scan_root_bus(NULL, pci_ctrl->first_busno, + bus = pci_scan_root_bus(NULL, 0, pci_ctrl->first_busno, pci_ctrl->ops, pci_ctrl, &resources); if (!bus) continue; diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index a0580af..f375252 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -986,7 +986,7 @@ static int __init dino_probe(struct parisc_device *dev) ** with configuration accessor functions. */ dino_dev->hba.hba_bus = bus = pci_create_root_bus(&dev->dev, - dino_current_bus, &dino_cfg_ops, NULL, &resources); + 0, dino_current_bus, &dino_cfg_ops, NULL, &resources); if (!bus) { printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n", dev_name(&dev->dev), dino_current_bus); diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index dceb9dd..2949030 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1563,7 +1563,7 @@ lba_driver_probe(struct parisc_device *dev) dev->dev.platform_data = lba_dev; lba_bus = lba_dev->hba.hba_bus = - pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start, + pci_create_root_bus(&dev->dev, 0, lba_dev->hba.bus_num.start, cfg_ops, NULL, &resources); if (!lba_bus) { pci_free_resource_list(&resources); diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c index 0863d9c..04388e2 100644 --- a/drivers/pci/host/pci-versatile.c +++ b/drivers/pci/host/pci-versatile.c @@ -208,7 +208,8 @@ static int versatile_pci_probe(struct platform_device *pdev) pci_add_flags(PCI_ENABLE_PROC_DOMAINS); pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC); - bus = pci_scan_root_bus(&pdev->dev, 0, &pci_versatile_ops, &sys, &pci_res); + bus = pci_scan_root_bus_generic(&pdev->dev, 0, &pci_versatile_ops, + &sys, &pci_res); if (!bus) return -ENOMEM; diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index a9dfb70..e9436fe 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -553,7 +553,7 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev) if (ret) return ret; - bus = pci_create_root_bus(&pdev->dev, 0, + bus = pci_create_root_bus_generic(&pdev->dev, 0, &xgene_pcie_ops, port, &res); if (!bus) return -ENOMEM; diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 69486be..28f1e67 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -708,7 +708,7 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) struct pcie_port *pp = sys_to_pcie(sys); pp->root_bus_nr = sys->busnr; - bus = pci_scan_root_bus(pp->dev, sys->busnr, + bus = pci_scan_root_bus_generic(pp->dev, sys->busnr, &dw_pcie_ops, sys, &sys->resources); if (!bus) return NULL; diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index d77481e..5d0c77b 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -210,7 +210,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) pcie->sysdata.private_data = pcie; - bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, + bus = pci_create_root_bus_generic(pcie->dev, 0, &iproc_pcie_ops, &pcie->sysdata, res); if (!bus) { dev_err(pcie->dev, "unable to create PCI root bus\n"); diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index f1a06a0..81f89fb 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -647,7 +647,7 @@ static struct pci_bus *xilinx_pcie_scan_bus(int nr, struct pci_sys_data *sys) struct pci_bus *bus; port->root_busno = sys->busnr; - bus = pci_scan_root_bus(port->dev, sys->busnr, &xilinx_pcie_ops, + bus = pci_scan_root_bus_generic(port->dev, sys->busnr, &xilinx_pcie_ops, sys, &sys->resources); return bus; diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 1530247..db6240e 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c @@ -765,7 +765,7 @@ static u8 bus_structure_fixup(u8 busno) (l != 0x0000) && (l != 0xffff)) { debug("%s - Inside bus_structure_fixup()\n", __func__); - b = pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); + b = pci_scan_bus(0, busno, ibmphp_pci_bus->ops, NULL); if (!b) continue; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cefd636..b49deb8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1927,8 +1927,9 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) { } -struct pci_bus *pci_create_root_bus(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata, struct list_head *resources) +struct pci_bus *pci_create_root_bus(struct device *parent, int domain, + int bus, struct pci_ops *ops, void *sysdata, + struct list_head *resources) { int error; struct pci_host_bridge *bridge; @@ -1958,6 +1959,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, if (!bridge) goto err_out; + bridge->domain = domain; bridge->dev.parent = parent; bridge->dev.release = pci_release_host_bridge_dev; dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); @@ -2096,8 +2098,9 @@ void pci_bus_release_busn_res(struct pci_bus *b) res, ret ? "can not be" : "is"); } -struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata, struct list_head *resources) +struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, + int bus, struct pci_ops *ops, void *sysdata, + struct list_head *resources) { struct resource_entry *window; bool found = false; @@ -2110,7 +2113,8 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, break; } - b = pci_create_root_bus(parent, bus, ops, sysdata, resources); + b = pci_create_root_bus(parent, domain, bus, ops, + sysdata, resources); if (!b) return NULL; @@ -2130,8 +2134,8 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, } EXPORT_SYMBOL(pci_scan_root_bus); -struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, - void *sysdata) +struct pci_bus *pci_scan_bus(int domain, int bus, + struct pci_ops *ops, void *sysdata) { LIST_HEAD(resources); struct pci_bus *b; @@ -2139,7 +2143,8 @@ struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); pci_add_resource(&resources, &busn_resource); - b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources); + b = pci_create_root_bus(NULL, domain, bus, ops, sysdata, + &resources); if (b) { pci_scan_child_bus(b); } else { diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 8b7a900..3452c42 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -481,7 +481,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev, pci_lock_rescan_remove(); - b = pci_scan_root_bus(&pdev->xdev->dev, bus, + b = pci_scan_root_bus(&pdev->xdev->dev, sd->domain, bus, &pcifront_bus_ops, sd, &resources); if (!b) { dev_err(&pdev->xdev->dev, diff --git a/include/linux/pci.h b/include/linux/pci.h index 8a0321a..50c0c47 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -402,6 +402,7 @@ static inline int pci_channel_offline(struct pci_dev *pdev) } struct pci_host_bridge { + int domain; struct device dev; struct pci_bus *bus; /* root bus */ struct list_head windows; /* resource_entry */ @@ -780,16 +781,29 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, void pcibios_scan_specific_bus(int busn); struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); -struct pci_bus *pci_create_root_bus(struct device *parent, int bus, +struct pci_bus *pci_scan_bus(int domain, int bus, struct pci_ops *ops, + void *sysdata); +struct pci_bus *pci_create_root_bus(struct device *parent, int domain, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources); +static inline struct pci_bus *pci_create_root_bus_generic( + struct device *parent, int bus, struct pci_ops *ops, + void *sysdata, struct list_head *resources) +{ + return pci_create_root_bus(parent, -1, bus, ops, sysdata, resources); +} 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); -struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, +struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources); +static inline struct pci_bus *pci_scan_root_bus_generic( + struct device *parent, int bus, struct pci_ops *ops, + void *sysdata, struct list_head *resources) +{ + return pci_scan_root_bus(parent, -1, bus, ops, sysdata, resources); +} 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 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> 2015-07-20 12:01 ` [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() Yijing Wang ` (9 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang pci_bus_assign_domain_nr() is only called in probe.c, Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci.h | 9 +++++++++ include/linux/pci.h | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4ff0ff1..02192aa 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -335,4 +335,13 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe) struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus); +#ifdef CONFIG_PCI_DOMAINS_GENERIC +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent); +#else +static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, + struct device *parent) +{ +} +#endif + #endif /* DRIVERS_PCI_H */ diff --git a/include/linux/pci.h b/include/linux/pci.h index 50c0c47..f7e4204 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1337,12 +1337,6 @@ static inline int pci_domain_nr(struct pci_bus *bus) { return bus->domain_nr; } -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent); -#else -static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, - struct device *parent) -{ -} #endif /* some architectures require additional setup to direct VGA traffic */ -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> 2015-07-20 12:01 ` [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang ` (8 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang pci_get_new_domain_nr() is only used in drivers/pci/pci.c, remove the declaration in include/linux/pci.h. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci.c | 4 ++-- include/linux/pci.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0008c95..59032e2 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4476,14 +4476,14 @@ static void pci_no_domains(void) } #ifdef CONFIG_PCI_DOMAINS +#ifdef CONFIG_PCI_DOMAINS_GENERIC static atomic_t __domain_nr = ATOMIC_INIT(-1); -int pci_get_new_domain_nr(void) +static int pci_get_new_domain_nr(void) { return atomic_inc_return(&__domain_nr); } -#ifdef CONFIG_PCI_DOMAINS_GENERIC void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) { static int use_dt_domains = -1; diff --git a/include/linux/pci.h b/include/linux/pci.h index f7e4204..4524592 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1319,12 +1319,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev); */ #ifdef CONFIG_PCI_DOMAINS extern int pci_domains_supported; -int pci_get_new_domain_nr(void); #else enum { pci_domains_supported = 0 }; static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline int pci_proc_domain(struct pci_bus *bus) { return 0; } -static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #endif /* CONFIG_PCI_DOMAINS */ /* @@ -1445,7 +1443,6 @@ static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; } -static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #define dev_is_pci(d) (false) #define dev_is_pf(d) (false) -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (2 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() Yijing Wang ` (7 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Introduce pci_host_assign_domain_nr() to assign domain number for pci_host_bridge. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci.c | 24 +++++++++++++++++++----- drivers/pci/pci.h | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 59032e2..79d01e4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4484,10 +4484,10 @@ static int pci_get_new_domain_nr(void) return atomic_inc_return(&__domain_nr); } -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +static int pci_assign_domain_nr(struct device *dev) { static int use_dt_domains = -1; - int domain = of_get_pci_domain_nr(parent->of_node); + int domain = of_get_pci_domain_nr(dev->of_node); /* * Check DT domain and use_dt_domains values. @@ -4521,16 +4521,30 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) use_dt_domains = 0; domain = pci_get_new_domain_nr(); } else { - dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", - parent->of_node->full_name); + dev_err(dev, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", + dev->of_node->full_name); domain = -1; } - bus->domain_nr = domain; + return domain; +} + +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +{ + bus->domain_nr = pci_assign_domain_nr(parent); } #endif #endif +void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain) +{ +#ifdef CONFIG_PCI_DOMAINS_GENERIC + host->domain = pci_assign_domain_nr(host->dev.parent); +#else + host->domain = domain; +#endif +} + /** * pci_ext_cfg_avail - can we access extended PCI config space? * diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 02192aa..4a815c9 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -344,4 +344,5 @@ static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, } #endif +void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain); #endif /* DRIVERS_PCI_H */ -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (3 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata Yijing Wang ` (6 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Pcibios_root_bridge_prepare() in powerpc set root bus speed, it's not the preparation for pci host bridge. For better separation of host bridge and root bus creation, It's need to rename it to another weak function. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/kernel/pci-common.c | 6 +++--- arch/powerpc/platforms/pseries/pci.c | 2 +- arch/powerpc/platforms/pseries/pseries.h | 2 +- arch/powerpc/platforms/pseries/setup.c | 2 +- drivers/pci/probe.c | 9 +++++++++ 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 952579f..dbd5e8b 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -100,7 +100,7 @@ struct machdep_calls { /* Called after allocating resources */ void (*pcibios_fixup)(void); void (*pci_irq_fixup)(struct pci_dev *dev); - int (*pcibios_root_bridge_prepare)(struct pci_host_bridge + int (*pcibios_root_bus_prepare)(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 df7f018..3e398c8 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -782,10 +782,10 @@ int pci_proc_domain(struct pci_bus *bus) return 1; } -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +int pcibios_root_bus_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_root_bus_prepare) + return ppc_md.pcibios_root_bus_prepare(bridge); return 0; } diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c index fe16a50..885f9ff 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_root_bus_prepare(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 8411c27..41310dc 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -75,7 +75,7 @@ static inline int dlpar_memory(struct pseries_hp_errorlog *hp_elog) /* PCI root bridge prepare function override for pseries */ struct pci_host_bridge; -int pseries_root_bridge_prepare(struct pci_host_bridge *bridge); +int pseries_root_bus_prepare(struct pci_host_bridge *bridge); extern struct pci_controller_ops pseries_pci_controller_ops; diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index df6a704..2815309 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -537,7 +537,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_root_bus_prepare = pseries_root_bus_prepare; if (firmware_has_feature(FW_FEATURE_SET_MODE)) { long rc; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b49deb8..0eba126 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1919,6 +1919,11 @@ int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) return 0; } +int __weak pcibios_root_bus_prepare(struct pci_host_bridge *bridge) +{ + return 0; +} + void __weak pcibios_add_bus(struct pci_bus *bus) { } @@ -1984,6 +1989,10 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, b->dev.class = &pcibus_class; b->dev.parent = b->bridge; dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus); + error = pcibios_root_bus_prepare(bridge); + if (error) + goto class_dev_reg_err; + error = device_register(&b->dev); if (error) goto class_dev_reg_err; -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (4 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus Yijing Wang ` (5 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Now platform specific sysdata is saved in pci_bus, and pcibios_root_bridge_prepare() need to know the sysdata. Later, we would move pcibios_root_bridge_prepare() prior to root bus creation, so we need to make pci_host_bridge hold sysdata. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/ia64/pci/pci.c | 2 +- arch/x86/pci/acpi.c | 2 +- drivers/pci/probe.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 67ffe1f..8f79852 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -485,7 +485,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) * that case. */ if (!bridge->dev.parent) { - struct pci_controller *controller = bridge->bus->sysdata; + struct pci_controller *controller = dev_get_drvdata(&bridge->dev); ACPI_COMPANION_SET(&bridge->dev, controller->companion); } return 0; diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 629fc3b..38ce348 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -502,7 +502,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) * that case. */ if (!bridge->dev.parent) { - struct pci_sysdata *sd = bridge->bus->sysdata; + struct pci_sysdata *sd = dev_get_drvdata(&bridge->dev); ACPI_COMPANION_SET(&bridge->dev, sd->companion); } return 0; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0eba126..0ae8bf2 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1967,6 +1967,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, bridge->domain = domain; bridge->dev.parent = parent; bridge->dev.release = pci_release_host_bridge_dev; + dev_set_drvdata(&bridge->dev, sysdata); dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); error = pcibios_root_bridge_prepare(bridge); if (error) { -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (5 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code Yijing Wang ` (4 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Pci_host_bridge hold the domain number, we need to assign domain number prior to root bus creation, because root bus need to know the domain number to check whether it's alreay exist. Also it's preparation for separating pci_host_bridge creation from pci_create_root_bus(). Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/probe.c | 58 +++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0ae8bf2..cb525aa 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -515,7 +515,7 @@ static void pci_release_host_bridge_dev(struct device *dev) kfree(bridge); } -static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) +static struct pci_host_bridge *pci_alloc_host_bridge(void) { struct pci_host_bridge *bridge; @@ -524,7 +524,6 @@ static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) return NULL; INIT_LIST_HEAD(&bridge->windows); - bridge->bus = b; return bridge; } @@ -1938,48 +1937,53 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, { int error; struct pci_host_bridge *bridge; - struct pci_bus *b, *b2; + struct pci_bus *b; struct resource_entry *window, *n; struct resource *res; resource_size_t offset; char bus_addr[64]; char *fmt; - b = pci_alloc_bus(NULL); - if (!b) + bridge = pci_alloc_host_bridge(); + if (!bridge) return NULL; - b->sysdata = sysdata; - b->ops = ops; - b->number = b->busn_res.start = bus; - pci_bus_assign_domain_nr(b, parent); - b2 = pci_find_bus(pci_domain_nr(b), bus); - if (b2) { + bridge->dev.parent = parent; + pci_host_assign_domain_nr(bridge, domain); + + b = pci_find_bus(bridge->domain, bus); + if (b) { /* If we already got to this bus through a different bridge, ignore it */ - dev_dbg(&b2->dev, "bus already known\n"); - goto err_out; + dev_dbg(&b->dev, "bus already known\n"); + kfree(bridge); + return NULL; } - bridge = pci_alloc_host_bridge(b); - if (!bridge) - goto err_out; - - bridge->domain = domain; - bridge->dev.parent = parent; bridge->dev.release = pci_release_host_bridge_dev; dev_set_drvdata(&bridge->dev, sysdata); - dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); + dev_set_name(&bridge->dev, "pci%04x:%02x", bridge->domain, bus); error = pcibios_root_bridge_prepare(bridge); if (error) { kfree(bridge); - goto err_out; + return NULL; } error = device_register(&bridge->dev); if (error) { put_device(&bridge->dev); - goto err_out; + return NULL; } + + b = pci_alloc_bus(NULL); + if (!b) + goto unregister_host; + + bridge->bus = b; + b->sysdata = sysdata; + b->ops = ops; + b->number = b->busn_res.start = bus; + pci_bus_assign_domain_nr(b, parent); + b->bridge = get_device(&bridge->dev); device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); @@ -1992,11 +1996,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus); error = pcibios_root_bus_prepare(bridge); if (error) - goto class_dev_reg_err; + goto free_bus; error = device_register(&b->dev); if (error) - goto class_dev_reg_err; + goto free_bus; pcibios_add_bus(b); @@ -2036,11 +2040,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, return b; -class_dev_reg_err: +free_bus: + kfree(b); put_device(&bridge->dev); +unregister_host: device_unregister(&bridge->dev); -err_out: - kfree(b); return NULL; } EXPORT_SYMBOL_GPL(pci_create_root_bus); -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (6 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang ` (3 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Now pci_host_bridge holds the domain number, we could introduce common pci_domain_nr(), and remove platform specific code. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/alpha/include/asm/pci.h | 2 -- arch/ia64/include/asm/pci.h | 1 - arch/microblaze/include/asm/pci.h | 2 -- arch/microblaze/pci/pci-common.c | 11 ----------- arch/mips/include/asm/pci.h | 2 -- arch/powerpc/include/asm/pci.h | 2 -- arch/powerpc/kernel/pci-common.c | 11 ----------- arch/s390/include/asm/pci.h | 1 - arch/s390/pci/pci.c | 6 ------ arch/sh/include/asm/pci.h | 2 -- arch/sparc/include/asm/pci_64.h | 1 - arch/sparc/kernel/pci.c | 17 ----------------- arch/tile/include/asm/pci.h | 2 -- arch/x86/include/asm/pci.h | 6 ------ drivers/pci/pci.c | 8 ++++++++ include/linux/pci.h | 7 +------ 16 files changed, 9 insertions(+), 72 deletions(-) diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index 98f2eee..1f50c81 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h @@ -79,8 +79,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? 15 : 14; } -#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index - static inline int pci_proc_domain(struct pci_bus *bus) { struct pci_controller *hose = bus->sysdata; diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 36d2c1e..ba6c40a 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -80,7 +80,6 @@ struct pci_controller { #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) -#define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment) extern struct pci_ops pci_root_ops; diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index dc9eb66..a452163 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -42,8 +42,6 @@ */ #define pcibios_assign_all_busses() 0 -extern int pci_domain_nr(struct pci_bus *bus); - /* Decide whether to display the domain number in /proc */ extern int pci_proc_domain(struct pci_bus *bus); diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index d232c8a..6f64908 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -123,17 +123,6 @@ unsigned long pci_address_to_pio(phys_addr_t address) } EXPORT_SYMBOL_GPL(pci_address_to_pio); -/* - * Return the domain number for this bus. - */ -int pci_domain_nr(struct pci_bus *bus) -{ - struct pci_controller *hose = pci_bus_to_host(bus); - - return hose->global_number; -} -EXPORT_SYMBOL(pci_domain_nr); - /* This routine is meant to be used early during boot, when the * PCI bus numbers have not yet been assigned, and you need to * issue PCI config cycles to an OF device. diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 98c31e5..8757775 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h @@ -114,8 +114,6 @@ struct pci_dev; extern unsigned int PCI_DMA_BUS_IS_PHYS; #ifdef CONFIG_PCI_DOMAINS -#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index - static inline int pci_proc_domain(struct pci_bus *bus) { struct pci_controller *hose = bus->sysdata; diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 3453bd8..f83b8c8 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -73,8 +73,6 @@ extern struct dma_map_ops *get_pci_dma_ops(void); #endif /* CONFIG_PPC64 */ -extern int pci_domain_nr(struct pci_bus *bus); - /* Decide whether to display the domain number in /proc */ extern int pci_proc_domain(struct pci_bus *bus); diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 3e398c8..42928a0 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -196,17 +196,6 @@ unsigned long pci_address_to_pio(phys_addr_t address) } EXPORT_SYMBOL_GPL(pci_address_to_pio); -/* - * Return the domain number for this bus. - */ -int pci_domain_nr(struct pci_bus *bus) -{ - struct pci_controller *hose = pci_bus_to_host(bus); - - return hose->global_number; -} -EXPORT_SYMBOL(pci_domain_nr); - /* This routine is meant to be used early during boot, when the * PCI bus numbers have not yet been assigned, and you need to * issue PCI config cycles to an OF device. diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index a648338..fe605b5 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -20,7 +20,6 @@ void __iomem *pci_iomap(struct pci_dev *, int, unsigned long); void pci_iounmap(struct pci_dev *, void __iomem *); -int pci_domain_nr(struct pci_bus *); int pci_proc_domain(struct pci_bus *); #define ZPCI_BUS_NR 0 /* default bus number */ diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index b9ac2f5..86acba4 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -101,12 +101,6 @@ static struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus) return (bus && bus->sysdata) ? (struct zpci_dev *) bus->sysdata : NULL; } -int pci_domain_nr(struct pci_bus *bus) -{ - return ((struct zpci_dev *) bus->sysdata)->domain; -} -EXPORT_SYMBOL_GPL(pci_domain_nr); - int pci_proc_domain(struct pci_bus *bus) { return pci_domain_nr(bus); diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index e343dbd..9d44611 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -91,8 +91,6 @@ extern void pcibios_set_master(struct pci_dev *dev); /* Board-specific fixup routines. */ int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin); -#define pci_domain_nr(bus) ((struct pci_channel *)(bus)->sysdata)->index - static inline int pci_proc_domain(struct pci_bus *bus) { struct pci_channel *hose = bus->sysdata; diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h index 022d160..229b4f6 100644 --- a/arch/sparc/include/asm/pci_64.h +++ b/arch/sparc/include/asm/pci_64.h @@ -33,7 +33,6 @@ /* Return the index of the PCI controller for device PDEV. */ -int pci_domain_nr(struct pci_bus *bus); static inline int pci_proc_domain(struct pci_bus *bus) { return 1; diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 1e957de..79c6941 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -886,23 +886,6 @@ int pcibus_to_node(struct pci_bus *pbus) EXPORT_SYMBOL(pcibus_to_node); #endif -/* Return the domain number for this pci bus */ - -int pci_domain_nr(struct pci_bus *pbus) -{ - struct pci_pbm_info *pbm = pbus->sysdata; - int ret; - - if (!pbm) { - ret = -ENXIO; - } else { - ret = pbm->index; - } - - return ret; -} -EXPORT_SYMBOL(pci_domain_nr); - #ifdef CONFIG_PCI_MSI int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) { diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h index dfedd7a..23a726e 100644 --- a/arch/tile/include/asm/pci.h +++ b/arch/tile/include/asm/pci.h @@ -199,8 +199,6 @@ int __init pcibios_init(void); void pcibios_fixup_bus(struct pci_bus *bus); -#define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index) - /* * This decides whether to display the domain number in /proc. */ diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 4625943..1ff7869 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -29,12 +29,6 @@ extern int noioapicreroute; #ifdef CONFIG_PCI #ifdef CONFIG_PCI_DOMAINS -static inline int pci_domain_nr(struct pci_bus *bus) -{ - struct pci_sysdata *sd = bus->sysdata; - return sd->domain; -} - static inline int pci_proc_domain(struct pci_bus *bus) { return pci_domain_nr(bus); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 79d01e4..0074420 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4476,6 +4476,14 @@ static void pci_no_domains(void) } #ifdef CONFIG_PCI_DOMAINS +int pci_domain_nr(struct pci_bus *bus) +{ + struct pci_host_bridge *host = pci_find_host_bridge(bus); + + return host->domain; +} +EXPORT_SYMBOL(pci_domain_nr); + #ifdef CONFIG_PCI_DOMAINS_GENERIC static atomic_t __domain_nr = ATOMIC_INIT(-1); diff --git a/include/linux/pci.h b/include/linux/pci.h index 4524592..6b4789c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1319,6 +1319,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev); */ #ifdef CONFIG_PCI_DOMAINS extern int pci_domains_supported; +int pci_domain_nr(struct pci_bus *bus); #else enum { pci_domains_supported = 0 }; static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } @@ -1330,12 +1331,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) { return 0; } * architecture does not need custom management of PCI * domains then this implementation will be used */ -#ifdef CONFIG_PCI_DOMAINS_GENERIC -static inline int pci_domain_nr(struct pci_bus *bus) -{ - return bus->domain_nr; -} -#endif /* some architectures require additional setup to direct VGA traffic */ typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode, -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (7 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-07-20 12:01 ` [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test Yijing Wang ` (2 subsequent siblings) 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Now we save the domain number in pci_host_bridge, we could remove pci_bus_assign_domain_nr() and clean the domain member in pci_bus. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- drivers/pci/pci.c | 5 ----- drivers/pci/pci.h | 9 --------- drivers/pci/probe.c | 11 +++-------- include/linux/pci.h | 3 --- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0074420..cac136a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4536,11 +4536,6 @@ static int pci_assign_domain_nr(struct device *dev) return domain; } - -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) -{ - bus->domain_nr = pci_assign_domain_nr(parent); -} #endif #endif diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4a815c9..5c4b0dd 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -335,14 +335,5 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe) struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus); -#ifdef CONFIG_PCI_DOMAINS_GENERIC -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent); -#else -static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, - struct device *parent) -{ -} -#endif - void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain); #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index cb525aa..5f2388b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -481,7 +481,7 @@ void pci_read_bridge_bases(struct pci_bus *child) } } -static struct pci_bus *pci_alloc_bus(struct pci_bus *parent) +static struct pci_bus *pci_alloc_bus(void) { struct pci_bus *b; @@ -496,10 +496,6 @@ static struct pci_bus *pci_alloc_bus(struct pci_bus *parent) INIT_LIST_HEAD(&b->resources); b->max_bus_speed = PCI_SPEED_UNKNOWN; b->cur_bus_speed = PCI_SPEED_UNKNOWN; -#ifdef CONFIG_PCI_DOMAINS_GENERIC - if (parent) - b->domain_nr = parent->domain_nr; -#endif return b; } @@ -670,7 +666,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, /* * Allocate a new bus, and inherit stuff from the parent.. */ - child = pci_alloc_bus(parent); + child = pci_alloc_bus(); if (!child) return NULL; @@ -1974,7 +1970,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, return NULL; } - b = pci_alloc_bus(NULL); + b = pci_alloc_bus(); if (!b) goto unregister_host; @@ -1982,7 +1978,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, b->sysdata = sysdata; b->ops = ops; b->number = b->busn_res.start = bus; - pci_bus_assign_domain_nr(b, parent); b->bridge = get_device(&bridge->dev); device_enable_async_suspend(b->bridge); diff --git a/include/linux/pci.h b/include/linux/pci.h index 6b4789c..8293f61 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -461,9 +461,6 @@ struct pci_bus { unsigned char primary; /* number of primary bridge */ unsigned char max_bus_speed; /* enum pci_bus_speed */ unsigned char cur_bus_speed; /* enum pci_bus_speed */ -#ifdef CONFIG_PCI_DOMAINS_GENERIC - int domain_nr; -#endif char name[48]; -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (8 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang @ 2015-07-20 12:01 ` Yijing Wang 2015-12-07 21:53 ` [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Bjorn Helgaas [not found] ` <20151207215356.GD14429@localhost> 11 siblings, 0 replies; 12+ messages in thread From: Yijing Wang @ 2015-07-20 12:01 UTC (permalink / raw) To: Bjorn Helgaas Cc: linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven, Yijing Wang Kbuild test robot found we passed a pci_dev * to pci_domain_nr(). In old IA64 specific pci_domain_nr() It was macro defines: #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) #define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment) Both pci_dev * and pci_bus * have opaque sysdata, so IA64 specific pci_domain_nr() could get the pci_controller and return the exact domain number, but now we use common pci_domain_nr() functions, so we should fix this warning. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- arch/ia64/sn/kernel/io_acpi_init.c | 6 +++--- arch/ia64/sn/kernel/io_init.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c index 0640739..2fd7414 100644 --- a/arch/ia64/sn/kernel/io_acpi_init.c +++ b/arch/ia64/sn/kernel/io_acpi_init.c @@ -364,12 +364,12 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL, &segment); if (ACPI_SUCCESS(status)) { - if (segment != pci_domain_nr(dev)) { + if (segment != pci_domain_nr(dev->bus)) { acpi_get_name(rootbus_handle, ACPI_FULL_PATHNAME, &name_buffer); printk(KERN_ERR "%s: Segment number mismatch, 0x%llx vs 0x%x for: %s\n", - __func__, segment, pci_domain_nr(dev), + __func__, segment, pci_domain_nr(dev->bus), (char *)name_buffer.pointer); kfree(name_buffer.pointer); return 1; @@ -407,7 +407,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, /* Build up the pcidev_info.pdi_slot_host_handle */ host_devfn = get_host_devfn(pcidev_match.handle, rootbus_handle); (*pcidev_info)->pdi_slot_host_handle = - ((unsigned long) pci_domain_nr(dev) << 40) | + ((unsigned long) pci_domain_nr(dev->bus) << 40) | /* bus == 0 */ host_devfn; return 0; diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index d528814..0bdab82 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -164,7 +164,7 @@ sn_io_slot_fixup(struct pci_dev *dev) panic("%s: Unable to alloc memory for sn_irq_info", __func__); /* Call to retrieve pci device information needed by kernel. */ - status = sal_get_pcidev_info((u64) pci_domain_nr(dev), + status = sal_get_pcidev_info((u64) pci_domain_nr(dev->bus), (u64) dev->bus->number, dev->devfn, (u64) __pa(pcidev_info), -- 1.7.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() [not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com> ` (9 preceding siblings ...) 2015-07-20 12:01 ` [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test Yijing Wang @ 2015-12-07 21:53 ` Bjorn Helgaas [not found] ` <20151207215356.GD14429@localhost> 11 siblings, 0 replies; 12+ messages in thread From: Bjorn Helgaas @ 2015-12-07 21:53 UTC (permalink / raw) To: Yijing Wang Cc: Bjorn Helgaas, linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven On Mon, Jul 20, 2015 at 08:01:08PM +0800, Yijing Wang wrote: > This series is splitted out from previous patchset > "Refine PCI scan interfaces and make generic pci host bridge". > It try to clean up all platform pci_domain_nr(), save domain > in pci_host_bridge, so we could get domain number from the > common interface. > > v11->v12: > Introduce wrap function pci_create_root_bus_generic() > and pci_create_root_bus_generic() for arm/arm64 which > enable CONFIG_PCI_DOMAINS_GENERIC. > Rebased this series based 4.2-rc1 > > Yijing Wang (10): > PCI: Save domain in pci_host_bridge > PCI: Move pci_bus_assign_domain_nr() declaration into > drivers/pci/pci.h > PCI: Remove declaration for pci_get_new_domain_nr() > PCI: Introduce pci_host_assign_domain_nr() to assign domain > powerpc/PCI: Rename pcibios_root_bridge_prepare() to > pcibios_root_bus_prepare() > PCI: Make pci_host_bridge hold sysdata in drvdata > PCI: Create pci host bridge prior to root bus > PCI: Introduce common pci_domain_nr() and remove platform specific > code > PCI: Remove pci_bus_assign_domain_nr() > IA64/PCI: Fix build warning found by kbuild test > > arch/alpha/include/asm/pci.h | 2 - > arch/alpha/kernel/pci.c | 4 +- > arch/alpha/kernel/sys_nautilus.c | 2 +- > arch/arm/kernel/bios32.c | 2 +- > arch/arm/mach-dove/pcie.c | 2 +- > arch/arm/mach-iop13xx/pci.c | 4 +- > arch/arm/mach-mv78xx0/pcie.c | 2 +- > arch/arm/mach-orion5x/pci.c | 4 +- > arch/frv/mb93090-mb00/pci-vdk.c | 3 +- > arch/ia64/include/asm/pci.h | 1 - > arch/ia64/pci/pci.c | 6 +- > arch/ia64/sn/kernel/io_acpi_init.c | 6 +- > arch/ia64/sn/kernel/io_init.c | 6 +- > arch/m68k/coldfire/pci.c | 2 +- > arch/microblaze/include/asm/pci.h | 2 - > arch/microblaze/pci/pci-common.c | 15 +---- > arch/mips/include/asm/pci.h | 2 - > arch/mips/pci/pci.c | 4 +- > arch/mn10300/unit-asb2305/pci.c | 3 +- > arch/powerpc/include/asm/machdep.h | 2 +- > arch/powerpc/include/asm/pci.h | 2 - > arch/powerpc/kernel/pci-common.c | 21 ++----- > arch/powerpc/platforms/pseries/pci.c | 2 +- > arch/powerpc/platforms/pseries/pseries.h | 2 +- > arch/powerpc/platforms/pseries/setup.c | 2 +- > arch/s390/include/asm/pci.h | 1 - > arch/s390/pci/pci.c | 10 +--- > arch/sh/drivers/pci/pci.c | 4 +- > arch/sh/include/asm/pci.h | 2 - > arch/sparc/include/asm/pci_64.h | 1 - > arch/sparc/kernel/leon_pci.c | 2 +- > arch/sparc/kernel/pci.c | 21 +------ > arch/sparc/kernel/pcic.c | 2 +- > arch/tile/include/asm/pci.h | 2 - > arch/tile/kernel/pci.c | 4 +- > arch/tile/kernel/pci_gx.c | 4 +- > arch/unicore32/kernel/pci.c | 2 +- > arch/x86/include/asm/pci.h | 6 -- > arch/x86/pci/acpi.c | 6 +- > arch/x86/pci/common.c | 2 +- > arch/xtensa/kernel/pci.c | 2 +- > drivers/parisc/dino.c | 2 +- > drivers/parisc/lba_pci.c | 2 +- > drivers/pci/host/pci-versatile.c | 3 +- > drivers/pci/host/pci-xgene.c | 2 +- > drivers/pci/host/pcie-designware.c | 2 +- > drivers/pci/host/pcie-iproc.c | 2 +- > drivers/pci/host/pcie-xilinx.c | 2 +- > drivers/pci/hotplug/ibmphp_core.c | 2 +- > drivers/pci/pci.c | 31 ++++++++-- > drivers/pci/pci.h | 1 + > drivers/pci/probe.c | 92 +++++++++++++++++------------- > drivers/pci/xen-pcifront.c | 2 +- > include/linux/pci.h | 39 ++++++------- > 54 files changed, 161 insertions(+), 195 deletions(-) Doesn't apply to v4.4-rc2. Please refresh and repost if this is still relevant. Bjorn ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <20151207215356.GD14429@localhost>]
* Re: [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() [not found] ` <20151207215356.GD14429@localhost> @ 2015-12-08 1:18 ` wangyijing 0 siblings, 0 replies; 12+ messages in thread From: wangyijing @ 2015-12-08 1:18 UTC (permalink / raw) To: Bjorn Helgaas Cc: Bjorn Helgaas, linux-pci, linux-kernel, linux-arm-kernel, Russell King, dja, linux-xtensa, x86, Thomas Gleixner, linux-mips, Benjamin Herrenschmidt, Rusty Russell, linuxppc-dev, linux-s390, Tony Luck, linux-ia64, David S. Miller, Guan Xuetao, linux-alpha, linux-m68k, linux-am33-list, Liviu Dudau, Arnd Bergmann, Geert Uytterhoeven > > Doesn't apply to v4.4-rc2. Please refresh and repost if this is still > relevant. Hi Bjorn, this is still relevant, I will refresh it and post the new version soon. Thanks! Yijing. > > . > ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-12-08 1:18 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1437393678-4077-1-git-send-email-wangyijing@huawei.com>
2015-07-20 12:01 ` [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test Yijing Wang
2015-12-07 21:53 ` [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Bjorn Helgaas
[not found] ` <20151207215356.GD14429@localhost>
2015-12-08 1:18 ` wangyijing
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).