From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 12/13] PCI: kill pci_fixup_parent_subordinate_busnr()
Date: Fri, 27 Jan 2012 18:49:30 -0800 [thread overview]
Message-ID: <1327718971-9598-13-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1327718971-9598-1-git-send-email-yinghai@kernel.org>
Now we can safely extend parent top and shrink them according iobusn_resource tree.
Don't need that any more.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/probe.c | 45 +++++++++------------------------------------
1 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 23c2f0d..54615a9 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -608,22 +608,6 @@ struct pci_bus *__ref pci_add_new_bus(struct pci_bus *parent, struct pci_dev *de
return child;
}
-static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
-{
- struct pci_bus *parent = child->parent;
-
- /* Attempts to fix that up are really dangerous unless
- we're going to re-assign all bus numbers. */
- if (!pcibios_assign_all_busses())
- return;
-
- while (parent->parent && parent->subordinate < max) {
- parent->subordinate = max;
- pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max);
- parent = parent->parent;
- }
-}
-
static void __devinit pci_bus_extend_top(struct pci_bus *parent,
resource_size_t size, struct resource *parent_res)
{
@@ -925,6 +909,13 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
/* Clear errors */
pci_write_config_word(dev, PCI_STATUS, 0xffff);
+ /*
+ * For CardBus bridges, we leave 4 bus numbers
+ * as cards with a PCI-to-PCI bridge can be
+ * inserted later.
+ * other just allocate 8 bus to avoid we fall into
+ * small hole in the middle.
+ */
ret = pci_bridge_probe_busn_res(bus, dev, &busn_res,
is_cardbus ? (CARDBUS_RESERVE_BUSNR + 1) : 8,
&parent_res);
@@ -963,29 +954,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
if (!is_cardbus) {
child->bridge_ctl = bctl;
- /*
- * Adjust subordinate busnr in parent buses.
- * We do this before scanning for children because
- * some devices may not be detected if the bios
- * was lazy.
- */
- pci_fixup_parent_subordinate_busnr(child, max);
+
/* Now we can scan all subordinate buses... */
max = pci_scan_child_bus(child);
- /*
- * now fix it up again since we have found
- * the real value of max.
- */
- pci_fixup_parent_subordinate_busnr(child, max);
-
- } else {
- /*
- * For CardBus bridges, we leave 4 bus numbers
- * as cards with a PCI-to-PCI bridge can be
- * inserted later.
- */
- pci_fixup_parent_subordinate_busnr(child, max);
}
+
/*
* Set the subordinate bus number to its real value.
*/
--
1.7.7
next prev parent reply other threads:[~2012-01-28 2:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-28 2:49 [PATCH -v2 0/13] PCI: allocate pci bus num range for unassigned bridge busn Yinghai Lu
2012-01-28 2:49 ` [PATCH 01/13] PCI: Add iobusn_resource Yinghai Lu
2012-01-28 2:49 ` [PATCH 02/13] PCI: Add busn_res operation functions Yinghai Lu
2012-01-30 15:28 ` Bjorn Helgaas
2012-01-30 18:32 ` Yinghai Lu
2012-01-28 2:49 ` [PATCH 03/13] PCI: Add busn_res tracking in core Yinghai Lu
2012-01-30 15:35 ` Bjorn Helgaas
2012-01-30 18:39 ` Yinghai Lu
2012-01-28 2:49 ` [PATCH 04/13] PCI, x86: Register busn_res for root buses Yinghai Lu
2012-01-28 2:49 ` [PATCH 05/13] PCI, ia64: " Yinghai Lu
2012-01-28 2:49 ` [PATCH 06/13] PCI, powerpc: " Yinghai Lu
2012-01-30 15:44 ` Bjorn Helgaas
2012-01-28 2:49 ` [PATCH 07/13] PCI, parisc: " Yinghai Lu
2012-01-28 2:49 ` [PATCH 08/13] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-01-30 15:50 ` Bjorn Helgaas
2012-01-30 18:42 ` Yinghai Lu
2012-01-28 2:49 ` [PATCH 09/13] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-01-30 15:59 ` Bjorn Helgaas
2012-01-30 18:51 ` Yinghai Lu
2012-01-28 2:49 ` [PATCH 10/13] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-01-30 16:04 ` Bjorn Helgaas
2012-01-30 18:52 ` Yinghai Lu
2012-01-28 2:49 ` [PATCH 11/13] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-01-28 2:49 ` Yinghai Lu [this message]
2012-01-30 16:09 ` [PATCH 12/13] PCI: kill pci_fixup_parent_subordinate_busnr() Bjorn Helgaas
2012-01-28 2:49 ` [PATCH 13/13] PCI: Seperate child bus scanning to two passes overall 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=1327718971-9598-13-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.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).