linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Dominik Brodowski <linux@dominikbrodowski.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	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 13/15] PCI: kill pci_fixup_parent_subordinate_busnr()
Date: Wed,  1 Feb 2012 14:44:00 -0800	[thread overview]
Message-ID: <1328136242-17725-14-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1328136242-17725-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 |   33 ++-------------------------------
 1 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 97100a9..890e3f9 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)
 {
@@ -970,24 +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 {
-			pci_fixup_parent_subordinate_busnr(child, max);
 		}
+
 		/*
 		 * Set the subordinate bus number to its real value.
 		 */
-- 
1.7.7


  parent reply	other threads:[~2012-02-01 22:46 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-01 22:43 [PATCH -v4 0/15] PCI: allocate pci bus num range for unassigned bridge busn Yinghai Lu
2012-02-01 22:43 ` [PATCH 01/15] Make %pR could handle bus resource with domain Yinghai Lu
2012-02-03 16:26   ` Bjorn Helgaas
2012-02-03 17:23     ` Yinghai Lu
2012-02-01 22:43 ` [PATCH 02/15] PCI: Add iobusn_resource Yinghai Lu
2012-02-03 16:36   ` Bjorn Helgaas
2012-02-03 17:19     ` Yinghai Lu
2012-02-03 23:38     ` Benjamin Herrenschmidt
2012-02-04  2:30       ` Yinghai Lu
2012-02-06 17:14         ` Bjorn Helgaas
2012-02-06 18:48           ` Yinghai Lu
2012-02-01 22:43 ` [PATCH 03/15] PCI: Add busn_res operation functions Yinghai Lu
2012-02-01 22:43 ` [PATCH 04/15] PCI: Add busn_res tracking in core Yinghai Lu
2012-02-01 22:43 ` [PATCH 05/15] PCI, x86: Register busn_res for root buses Yinghai Lu
2012-02-01 22:43 ` [PATCH 06/15] PCI, ia64: " Yinghai Lu
2012-02-01 22:43 ` [PATCH 07/15] PCI, powerpc: " Yinghai Lu
2012-02-01 22:43 ` [PATCH 08/15] PCI, parisc: " Yinghai Lu
2012-02-01 22:43 ` [PATCH 09/15] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-02-01 22:43 ` [PATCH 10/15] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-02-01 22:43 ` [PATCH 11/15] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-02-01 22:43 ` [PATCH 12/15] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-02-01 22:44 ` Yinghai Lu [this message]
2012-02-01 22:44 ` [PATCH 14/15] PCI: Seperate child bus scanning to two passes overall Yinghai Lu
2012-02-01 22:44 ` [PATCH 15/15] pcmcia: remove workaround for fixing pci parent bus subordinate 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=1328136242-17725-14-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.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=linux@dominikbrodowski.net \
    --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).