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>
Subject: [PATCH 31/39] PCI: Probe safe range that we can use for unassigned bridge.
Date: Wed, 29 Feb 2012 15:07:30 -0800 [thread overview]
Message-ID: <1330556858-11768-32-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330556858-11768-1-git-send-email-yinghai@kernel.org>
Try to allocate from parent bus busn_res. if can not find any big enough, will try
to extend parent bus top. even the extending is through allocating, after allocating
will pad the range to parent buses top.
When extending happens, We will record the parent_res, so could use it as stopper
for really extend/shrink top later.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/probe.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 110 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 96259f8..c540022 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -691,6 +691,116 @@ static void __devinit pci_bus_shrink_top(struct pci_bus *parent,
pci_bus_update_top(parent, -size, parent_res);
}
+static resource_size_t __devinit find_res_top_free_size(struct resource *res)
+{
+ resource_size_t n_size;
+ struct resource tmp_res;
+
+ /*
+ * find out number below res->end, that we can use at first
+ * res->start can not be used.
+ */
+ n_size = resource_size(res) - 1;
+ memset(&tmp_res, 0, sizeof(struct resource));
+ while (n_size > 0) {
+ int ret;
+
+ ret = allocate_resource(res, &tmp_res, n_size,
+ res->end - n_size + 1, res->end,
+ 1, NULL, NULL);
+ if (ret == 0) {
+ release_resource(&tmp_res);
+ break;
+ }
+ n_size--;
+ }
+
+ return n_size;
+}
+
+static int __devinit pci_bridge_probe_busn_res(struct pci_bus *bus,
+ struct pci_dev *dev, struct resource *busn_res,
+ resource_size_t needed_size, struct resource **p)
+{
+ int ret = -ENOMEM;
+ resource_size_t n_size;
+ struct pci_bus *parent;
+ struct resource *parent_res = NULL;
+ resource_size_t tmp = bus->busn_res.end + 1;
+ int free_sz = -1;
+
+again:
+ /*
+ * find bigest range in bus->busn_res that we can use in the middle
+ * and we can not use bus->busn_res.start.
+ */
+ n_size = resource_size(&bus->busn_res) - 1;
+ memset(busn_res, 0, sizeof(struct resource));
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "find free busn in busn_res: %pR\n", &bus->busn_res);
+ while (n_size >= needed_size) {
+ ret = allocate_resource(&bus->busn_res, busn_res, n_size,
+ bus->busn_res.start + 1, bus->busn_res.end,
+ 1, NULL, NULL);
+ if (ret == 0) {
+ /* found one, prepare to return */
+ release_resource(busn_res);
+
+ return ret;
+ }
+ n_size--;
+ }
+
+ /* try extend the top of parent bus, find free under top af first */
+ if (free_sz < 0) {
+ free_sz = find_res_top_free_size(&bus->busn_res);
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "found free busn %d in busn_res: %pR top\n",
+ free_sz, &bus->busn_res);
+ }
+ n_size = free_sz;
+
+ /* can not extend cross domain boundary */
+ if ((0xff - bus->busn_res.end) < (needed_size - n_size))
+ goto reduce_needed_size;
+
+ /* find exteded range */
+ memset(busn_res, 0, sizeof(struct resource));
+ parent = bus->parent;
+ while (parent) {
+ ret = allocate_resource(&parent->busn_res, busn_res,
+ needed_size - n_size,
+ tmp, tmp + needed_size - n_size - 1,
+ 1, NULL, NULL);
+ if (ret == 0)
+ break;
+ parent = parent->parent;
+ }
+
+reduce_needed_size:
+ if (ret != 0) {
+ needed_size--;
+ if (!needed_size)
+ return ret;
+
+ goto again;
+ }
+
+ /* save parent_res, we need it as stopper later */
+ parent_res = busn_res->parent;
+
+ /* prepare busn_res for return */
+ release_resource(busn_res);
+ busn_res->start -= n_size;
+
+ /* extend parent bus top*/
+ pci_bus_extend_top(bus, needed_size - n_size, parent_res);
+
+ *p = parent_res;
+
+ return ret;
+}
+
/*
* If it's a bridge, configure it and scan the bus behind it.
* For CardBus bridges, we don't scan behind as the devices will
--
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 ` [PATCH 28/39] PCI, powerpc: " Yinghai Lu
2012-02-29 23:07 ` 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 ` Yinghai Lu [this message]
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 ` [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-32-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=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: link
Be 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).