From: Yinghai Lu <yinghai@kernel.org> To: Jesse Barnes <jbarnes@virtuousgeek.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Tony Luck <tony.luck@intel.com>, David Miller <davem@davemloft.net>, x86 <x86@kernel.org> Cc: linux-arch@vger.kernel.org, linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Dominik Brodowski <linux@dominikbrodowski.net>, Paul Mackerras <paulus@samba.org>, Bjorn Helgaas <bhelgaas@google.com>, Yinghai Lu <yinghai@kernel.org> Subject: [PATCH 28/39] PCI, powerpc: Register busn_res for root buses Date: Wed, 29 Feb 2012 15:07:27 -0800 [thread overview] Message-ID: <1330556858-11768-29-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1330556858-11768-1-git-send-email-yinghai@kernel.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/include/asm/pci-bridge.h | 1 + arch/powerpc/kernel/pci-common.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 5d48765..11cebf0 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -30,6 +30,7 @@ struct pci_controller { int first_busno; int last_busno; int self_busno; + struct resource busn; void __iomem *io_base_virt; #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 910b9de..ee8c0c9 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1648,6 +1648,11 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) /* Wire up PHB bus resources */ pcibios_setup_phb_resources(hose, &resources); + hose->busn.start = hose->first_busno; + hose->busn.end = hose->last_busno; + hose->busn.flags = IORESOURCE_BUS; + 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); @@ -1670,8 +1675,11 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) of_scan_bus(node, bus); } - if (mode == PCI_PROBE_NORMAL) + if (mode == PCI_PROBE_NORMAL) { + pci_bus_update_busn_res_end(bus, 255); hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); + pci_bus_update_busn_res_end(bus, bus->subordinate); + } /* Platform gets a chance to do some global fixups before * we proceed to resource allocation -- 1.7.7
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org> To: Jesse Barnes <jbarnes@virtuousgeek.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Tony Luck <tony.luck@intel.com>, David Miller <davem@davemloft.net>, x86 <x86@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com>, Dominik Brodowski <linux@dominikbrodowski.net>, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 28/39] PCI, powerpc: Register busn_res for root buses Date: Wed, 29 Feb 2012 15:07:27 -0800 [thread overview] Message-ID: <1330556858-11768-29-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20120229230727.HDOtZc8W-DGg9oj1zwUPJ3W81ocvX_xsXIVcVD8mDMY@z> (raw) In-Reply-To: <1330556858-11768-1-git-send-email-yinghai@kernel.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/include/asm/pci-bridge.h | 1 + arch/powerpc/kernel/pci-common.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 5d48765..11cebf0 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -30,6 +30,7 @@ struct pci_controller { int first_busno; int last_busno; int self_busno; + struct resource busn; void __iomem *io_base_virt; #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 910b9de..ee8c0c9 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1648,6 +1648,11 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) /* Wire up PHB bus resources */ pcibios_setup_phb_resources(hose, &resources); + hose->busn.start = hose->first_busno; + hose->busn.end = hose->last_busno; + hose->busn.flags = IORESOURCE_BUS; + 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); @@ -1670,8 +1675,11 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) of_scan_bus(node, bus); } - if (mode == PCI_PROBE_NORMAL) + if (mode == PCI_PROBE_NORMAL) { + pci_bus_update_busn_res_end(bus, 255); hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); + pci_bus_update_busn_res_end(bus, bus->subordinate); + } /* Platform gets a chance to do some global fixups before * we proceed to resource allocation -- 1.7.7
next prev parent reply other threads:[~2012-02-29 23:07 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-29 23:06 [PATCH 00/39] PCI: pci_host_bridge related cleanup and busn_alloc Yinghai Lu 2012-02-29 23:07 ` [PATCH 01/39] PCI: Separate host_bridge code out from probe.c Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 02/39] x86, PCI: have own version for pcibios_bus_to_resource Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:20 ` Bjorn Helgaas 2012-02-29 23:33 ` Yinghai Lu 2012-03-01 0:42 ` Bjorn Helgaas 2012-03-01 0:42 ` Bjorn Helgaas 2012-03-01 2:54 ` Yinghai Lu 2012-03-01 2:54 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 03/39] x86, PCI: Fix memleak with get_current_resources Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 04/39] PCI: rename pci_host_bridge() to find_pci_root_bridge() Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 05/39] PCI: add generic device into pci_host_bridge struct Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 06/39] PCI: add host bridge release support Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 07/39] x86, PCI: break down get_current_resource() Yinghai Lu 2012-02-29 23:07 ` [PATCH 08/39] x86, PCI: add host bridge resource release for using _CRS Yinghai Lu 2012-02-29 23:07 ` [PATCH 09/39] x86, PCI: embed name acpi version pci_root_info struct Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 10/39] x86, PCI: embed pci_sysdata into pci_root_info on acpi path Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 11/39] x86, PCI: Allocating pci_root_info for not using _CRS path Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 12/39] x86, PCI: Merge root info printing for nocrs path Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 13/39] x86, PCI: add print all root info " Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 14/39] x86, PCI: allocate temp range array in amd_bus pci_root_info probing Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 15/39] x86, PCI: Merge pcibios_scan_root and pci_scan_bus_on_node Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 16/39] PCI: skip busn resource at first Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 17/39] x86, PCI: put busn resource in pci_root_info for acpi path Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 18/39] PCI: default busn_resource Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 19/39] x86, PCI: put busn resource in pci_root_info for no_crs path Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 20/39] PCI: Add busn_res into struct pci_bus Yinghai Lu 2012-02-29 23:07 ` [PATCH 21/39] PCI: Add busn_res operation functions Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 22/39] PCI: release busn when removing bus Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 23/39] PCI: insert busn_res in pci_create_root_bus Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 24/39] PCI: checking busn_res in pci_scan_root_bus Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 25/39] PCI: add default res for pci_scan_bus Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 26/39] PCI, ia64: Register busn_res for root buses Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 27/39] PCI, sparc: " Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu [this message] 2012-02-29 23:07 ` [PATCH 28/39] PCI, powerpc: " Yinghai Lu 2012-02-29 23:07 ` [PATCH 29/39] PCI, parisc: " Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 30/39] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 31/39] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 32/39] PCI: Strict checking of valid range for bridge Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 33/39] PCI: Allocate bus range instead of use max blindly Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 34/39] PCI: kill pci_fixup_parent_subordinate_busnr() Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 35/39] PCI: Seperate child bus scanning to two passes overall Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 36/39] pcmcia: remove workaround for fixing pci parent bus subordinate Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 37/39] PCI: Double checking setting for bus register and bus struct Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 38/39] PCI, pciehp: Remove not needed bus number range checking Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:07 ` [PATCH 39/39] x86, PCI: kill busn in acpi pci_root_info Yinghai Lu 2012-02-29 23:07 ` Yinghai Lu 2012-02-29 23:32 ` Bjorn Helgaas 2012-02-29 23:32 ` Bjorn Helgaas 2012-02-29 23:37 ` Yinghai Lu 2012-02-29 23:37 ` Yinghai Lu 2012-02-29 23:51 ` Greg KH 2012-03-01 0:27 ` Jesse Barnes 2012-03-01 2:57 ` Yinghai Lu 2012-03-01 2:57 ` Yinghai Lu 2012-03-01 18:51 ` [PATCH 00/39] PCI: pci_host_bridge related cleanup and busn_alloc Myron Stowe 2012-03-01 18:51 ` Myron Stowe 2012-03-01 19:03 ` Yinghai Lu 2012-03-01 19:03 ` Yinghai Lu
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=1330556858-11768-29-git-send-email-yinghai@kernel.org \ --to=yinghai@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=bhelgaas@google.com \ --cc=davem@davemloft.net \ --cc=jbarnes@virtuousgeek.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux@dominikbrodowski.net \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=paulus@samba.org \ --cc=tony.luck@intel.com \ --cc=x86@kernel.org \ /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 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).