From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> To: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Bjorn Helgaas <bhelgaas@google.com>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Arnd Bergmann <arnd@arndb.de>, Will Deacon <will.deacon@arm.com>, Russell King <linux@armlinux.org.uk>, Pratyush Anand <pratyush.anand@gmail.com>, Jingoo Han <jingoohan1@gmail.com>, Rob Herring <robh@kernel.org>, Simon Horman <horms@verge.net.au>, Mingkai Hu <mingkai.hu@freescale.com>, Tanmay Inamdar <tinamdar@apm.com>, Murali Karicheri <m-karicheri2@ti.com>, Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>, Wenrui Li <wenrui.li@rock-chips.com>, Shawn Lin <shawn.lin@rock-chips.com>, Minghuan Lian <minghuan.Lian@freescale.com>, Gabriele Paoloni <gabriele.paoloni@huawei.com>, Joao Pinto <Joao.Pinto@synopsys.com>, Thierry Reding <thierry.reding@gmail.com>, Michal Simek <michal.simek@xilinx.com>, Stanimir Varbanov <svarbanov@mm-sol.com>, Zhou Wang <wangzhou1@hisilicon.com>, Roy Zang <tie-fei.zang@freescale.com>, Matthew Minter <matt@masarand.com>, Linus Walleij <linus.walleij@linaro.org> Subject: [RFT PATCH v2 13/42] PCI: aardvark: Convert PCI scan API to pci_scan_root_bus_bridge() Date: Thu, 8 Jun 2017 15:13:13 +0100 [thread overview] Message-ID: <20170608141342.2018-14-lorenzo.pieralisi@arm.com> (raw) In-Reply-To: <20170608141342.2018-1-lorenzo.pieralisi@arm.com> The introduction of pci_scan_root_bus_bridge() provides a PCI core API to scan a PCI root bus backed by an already initialized struct pci_host_bridge object, which simplifies the bus scan interface and makes the PCI scan root bus interface easier to generalize as members are added to the struct pci_host_bridge. Convert PCI aardvark host code to pci_scan_root_bus_bridge() to improve the PCI root bus scanning interface. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/pci/host/pci-aardvark.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 37d0bcd..5fb9b62 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -886,12 +886,14 @@ static int advk_pcie_probe(struct platform_device *pdev) struct advk_pcie *pcie; struct resource *res; struct pci_bus *bus, *child; + struct pci_host_bridge *bridge; int ret, irq; - pcie = devm_kzalloc(dev, sizeof(struct advk_pcie), GFP_KERNEL); - if (!pcie) + bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct advk_pcie)); + if (!bridge) return -ENOMEM; + pcie = pci_host_bridge_priv(bridge); pcie->pdev = pdev; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -929,14 +931,21 @@ static int advk_pcie_probe(struct platform_device *pdev) return ret; } - bus = pci_scan_root_bus(dev, 0, &advk_pcie_ops, - pcie, &pcie->resources); - if (!bus) { + list_splice_init(&pcie->resources, &bridge->windows); + bridge->dev.parent = dev; + bridge->sysdata = pcie; + bridge->busnr = 0; + bridge->ops = &advk_pcie_ops; + + ret = pci_scan_root_bus_bridge(bridge); + if (ret < 0) { advk_pcie_remove_msi_irq_domain(pcie); advk_pcie_remove_irq_domain(pcie); - return -ENOMEM; + return ret; } + bus = bridge->bus; + pci_bus_assign_resources(bus); list_for_each_entry(child, &bus->children, node) -- 2.10.0
WARNING: multiple messages have this Message-ID (diff)
From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) To: linux-arm-kernel@lists.infradead.org Subject: [RFT PATCH v2 13/42] PCI: aardvark: Convert PCI scan API to pci_scan_root_bus_bridge() Date: Thu, 8 Jun 2017 15:13:13 +0100 [thread overview] Message-ID: <20170608141342.2018-14-lorenzo.pieralisi@arm.com> (raw) In-Reply-To: <20170608141342.2018-1-lorenzo.pieralisi@arm.com> The introduction of pci_scan_root_bus_bridge() provides a PCI core API to scan a PCI root bus backed by an already initialized struct pci_host_bridge object, which simplifies the bus scan interface and makes the PCI scan root bus interface easier to generalize as members are added to the struct pci_host_bridge. Convert PCI aardvark host code to pci_scan_root_bus_bridge() to improve the PCI root bus scanning interface. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/pci/host/pci-aardvark.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 37d0bcd..5fb9b62 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -886,12 +886,14 @@ static int advk_pcie_probe(struct platform_device *pdev) struct advk_pcie *pcie; struct resource *res; struct pci_bus *bus, *child; + struct pci_host_bridge *bridge; int ret, irq; - pcie = devm_kzalloc(dev, sizeof(struct advk_pcie), GFP_KERNEL); - if (!pcie) + bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct advk_pcie)); + if (!bridge) return -ENOMEM; + pcie = pci_host_bridge_priv(bridge); pcie->pdev = pdev; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -929,14 +931,21 @@ static int advk_pcie_probe(struct platform_device *pdev) return ret; } - bus = pci_scan_root_bus(dev, 0, &advk_pcie_ops, - pcie, &pcie->resources); - if (!bus) { + list_splice_init(&pcie->resources, &bridge->windows); + bridge->dev.parent = dev; + bridge->sysdata = pcie; + bridge->busnr = 0; + bridge->ops = &advk_pcie_ops; + + ret = pci_scan_root_bus_bridge(bridge); + if (ret < 0) { advk_pcie_remove_msi_irq_domain(pcie); advk_pcie_remove_irq_domain(pcie); - return -ENOMEM; + return ret; } + bus = bridge->bus; + pci_bus_assign_resources(bus); list_for_each_entry(child, &bus->children, node) -- 2.10.0
next prev parent reply other threads:[~2017-06-08 14:13 UTC|newest] Thread overview: 139+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-08 14:13 [RFT PATCH v2 00/42] PCI: ARM/ARM64: remove pci_fixup_irqs() usage Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 01/42] PCI: xilinx-nwl: Remove nwl_pcie_enable_msi() unused bus parameter Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 02/42] drivers: pci: host: iproc: Convert link check to raw PCI config accessors Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 15:56 ` Ray Jui 2017-06-08 16:36 ` Lorenzo Pieralisi 2017-06-08 16:36 ` Lorenzo Pieralisi 2017-06-11 4:12 ` Oza Oza 2017-06-11 4:12 ` Oza Oza 2017-06-12 16:13 ` Lorenzo Pieralisi 2017-06-12 16:13 ` Lorenzo Pieralisi 2017-06-12 17:40 ` Oza Oza 2017-06-12 18:52 ` Ray Jui 2017-06-13 8:22 ` Oza Oza 2017-06-13 17:18 ` Ray Jui 2017-06-14 13:39 ` Lorenzo Pieralisi 2017-06-14 13:39 ` Lorenzo Pieralisi 2017-06-21 14:39 ` Oza Oza 2017-06-21 14:39 ` Oza Oza 2017-07-19 12:13 ` Oza Oza 2017-07-19 17:48 ` Lorenzo Pieralisi 2017-07-19 17:48 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 03/42] drivers: pci: host: ftpci100: convert IRQ masking " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-16 9:05 ` Linus Walleij 2017-06-16 9:05 ` Linus Walleij 2017-06-08 14:13 ` [RFT PATCH v2 04/42] PCI: Initialize bridge release function at bridge allocation Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 05/42] PCI: Add pci_free_host_bridge interface Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 06/42] PCI: Add devm_pci_alloc_host_bridge() interface Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 07/42] drivers: pci: host: ftpci100: Fix host bridge memory leakage Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-16 9:02 ` Linus Walleij 2017-06-16 9:02 ` Linus Walleij 2017-06-08 14:13 ` [RFT PATCH v2 08/42] drivers: pci: host: tegra: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 09/42] PCI: Introduce pci_scan_root_bus_bridge() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 10/42] PCI: Make pci_register_host_bridge() PCI core internal Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 11/42] ARM: PCI: bios32: Convert PCI scan API to pci_scan_root_bus_bridge() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 12/42] PCI: designware: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi [this message] 2017-06-08 14:13 ` [RFT PATCH v2 13/42] PCI: aardvark: " Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 14/42] PCI: rcar: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 15/42] PCI: iproc: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 16/42] PCI: versatile: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 17/42] PCI: altera: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 18/42] PCI: xilinx: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 19/42] PCI: xgene: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 20/42] PCI: host-common: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 21/42] PCI: rockchip: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 22/42] PCI: xilinx-nwl: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 23/42] PCI: Remove pci_scan_root_bus_msi() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 24/42] PCI: Build setup-irq.o on all arches Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 25/42] PCI: Add IRQ mapping function pointers to pci_host_bridge struct Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 26/42] PCI: Add pci_assign_irq() function and have pci_fixup_irqs() use it Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 27/42] OF/PCI: Update of_irq_parse_and_map_pci() comment Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 28/42] PCI: Add a call to pci_assign_irq() in pci_device_probe() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 29/42] ARM: PCI: Remove pci_fixup_irqs() call for bios32 host controllers Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-07-01 14:06 ` Lorenzo Pieralisi 2017-07-01 14:06 ` Lorenzo Pieralisi 2017-07-02 21:19 ` Bjorn Helgaas 2017-07-02 21:19 ` Bjorn Helgaas 2017-07-03 10:26 ` Lorenzo Pieralisi 2017-07-03 10:26 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 30/42] PCI: tegra: Drop pci_fixup_irqs() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 31/42] PCI: xilinx: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 32/42] PCI: rcar: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 33/42] PCI: iproc: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 34/42] PCI: designware-host: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 35/42] PCI: ftpci100: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 36/42] PCI: host-common: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 37/42] PCI: versatile: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 38/42] PCI: altera: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 39/42] PCI: xgene: Move to struct pci_host_bridge IRQ mapping functions Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 40/42] PCI: rockchip: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 41/42] PCI: xilinx-nwl: " Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-08 14:13 ` [RFT PATCH v2 42/42] ARM64: PCI: Drop DT IRQ allocation from pcibios_alloc_irq() Lorenzo Pieralisi 2017-06-08 14:13 ` Lorenzo Pieralisi 2017-06-12 15:45 ` [RFT PATCH v2 00/42] PCI: ARM/ARM64: remove pci_fixup_irqs() usage Will Deacon 2017-06-12 15:45 ` Will Deacon 2017-06-12 16:20 ` Lorenzo Pieralisi 2017-06-12 16:20 ` Lorenzo Pieralisi 2017-06-12 23:58 ` Khuong Dinh 2017-06-19 23:12 ` Bjorn Helgaas 2017-06-19 23:12 ` Bjorn Helgaas 2017-06-20 14:44 ` Lorenzo Pieralisi 2017-06-20 14:44 ` Lorenzo Pieralisi 2017-06-21 8:39 ` Linus Walleij 2017-06-21 8:39 ` Linus Walleij 2017-06-21 9:50 ` Lorenzo Pieralisi 2017-06-21 9:50 ` Lorenzo Pieralisi 2017-06-21 10:30 ` Lorenzo Pieralisi 2017-06-21 10:30 ` Lorenzo Pieralisi 2017-06-21 10:45 ` Lorenzo Pieralisi 2017-06-21 10:45 ` Lorenzo Pieralisi 2017-06-21 14:51 ` Linus Walleij 2017-06-21 14:51 ` Linus Walleij 2017-06-21 15:14 ` Linus Walleij 2017-06-21 15:14 ` Linus Walleij 2017-06-21 15:41 ` Lorenzo Pieralisi 2017-06-21 15:41 ` Lorenzo Pieralisi 2017-06-21 16:28 ` Linus Walleij 2017-06-21 16:28 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170608141342.2018-14-lorenzo.pieralisi@arm.com \ --to=lorenzo.pieralisi@arm.com \ --cc=Joao.Pinto@synopsys.com \ --cc=arnd@arndb.de \ --cc=bharat.kumar.gogada@xilinx.com \ --cc=bhelgaas@google.com \ --cc=gabriele.paoloni@huawei.com \ --cc=horms@verge.net.au \ --cc=jingoohan1@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=m-karicheri2@ti.com \ --cc=matt@masarand.com \ --cc=michal.simek@xilinx.com \ --cc=minghuan.Lian@freescale.com \ --cc=mingkai.hu@freescale.com \ --cc=pratyush.anand@gmail.com \ --cc=robh@kernel.org \ --cc=shawn.lin@rock-chips.com \ --cc=svarbanov@mm-sol.com \ --cc=thierry.reding@gmail.com \ --cc=thomas.petazzoni@free-electrons.com \ --cc=tie-fei.zang@freescale.com \ --cc=tinamdar@apm.com \ --cc=wangzhou1@hisilicon.com \ --cc=wenrui.li@rock-chips.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.