linux-arch.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>,
	David Miller <davem@davemloft.net>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Dominik Brodowski <linux@dominikbrodowski.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 24/24] PCI, pciehp: Remove not needed bus number range checking
Date: Tue, 28 Feb 2012 14:07:43 -0800	[thread overview]
Message-ID: <1330466863-28469-25-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330466863-28469-1-git-send-email-yinghai@kernel.org>

Found hotplug adding one EM with bridge fail, bios only leave one bus range
 for slot.

[ 1169.621444] pciehp: No bus number available for hot-added bridge 0000:55:00.0
[ 1169.633277] pcieport 0000:40:03.0: PCI bridge to [bus 55-55]

With busn_res tracking and allocating, we don't need that checking anymore.

Parent bridges' bus number will be extended safely.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/hotplug/pciehp_pci.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 47d9dc0..e21171c 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -37,18 +37,8 @@
 static int __ref pciehp_add_bridge(struct pci_dev *dev)
 {
 	struct pci_bus *parent = dev->bus;
-	int pass, busnr, start = parent->secondary;
-	int end = parent->subordinate;
+	int pass, busnr = parent->secondary;
 
-	for (busnr = start; busnr <= end; busnr++) {
-		if (!pci_find_bus(pci_domain_nr(parent), busnr))
-			break;
-	}
-	if (busnr-- > end) {
-		err("No bus number available for hot-added bridge %s\n",
-				pci_name(dev));
-		return -1;
-	}
 	for (pass = 0; pass < 2; pass++)
 		busnr = pci_scan_bridge(parent, dev, busnr, pass);
 	if (!dev->subordinate)
-- 
1.7.7

  parent reply	other threads:[~2012-02-28 22:07 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-28 22:07 [PATCH -v9 00/24] PCI: allocate pci bus num range for unassigned bridge busn Yinghai Lu
2012-02-28 22:07 ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 01/24] x86, PCI: add print all root info for nocrs path Yinghai Lu
2012-02-28 22:07 ` [PATCH 02/24] x86, PCI: Merge pcibios_scan_root and pci_scan_bus_on_node Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 03/24] PCI: Add busn_res into struct pci_bus Yinghai Lu
2012-02-28 22:07 ` [PATCH 04/24] PCI: Add busn_res operation functions Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 05/24] PCI: release busn when removing bus Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 06/24] PCI: insert busn_res in pci_create_root_bus Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 07/24] PCI: checking busn_res in pci_scan_root_bus Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 08/24] PCI: default busn_resource Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 09/24] PCI: add default res for pci_scan_bus Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 10/24] x86, PCI: put busn resource in pci_root_info for acpi path Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 11/24] x86, PCI: put busn resource in pci_root_info for no_crs path Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 12/24] PCI, ia64: Register busn_res for root buses Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-29  0:01   ` Bjorn Helgaas
2012-02-29  0:01     ` Bjorn Helgaas
2012-02-29  0:12     ` Yinghai Lu
2012-02-29  0:12       ` Yinghai Lu
2012-02-29  0:22       ` Bjorn Helgaas
2012-02-29  4:26         ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 13/24] PCI, sparc: " Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 14/24] PCI, powerpc: " Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 15/24] PCI, parisc: " Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 16/24] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 17/24] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 18/24] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-02-28 22:07 ` [PATCH 19/24] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 20/24] PCI: kill pci_fixup_parent_subordinate_busnr() Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 21/24] PCI: Seperate child bus scanning to two passes overall Yinghai Lu
2012-02-28 22:07 ` [PATCH 22/24] pcmcia: remove workaround for fixing pci parent bus subordinate Yinghai Lu
2012-02-28 22:07   ` Yinghai Lu
2012-02-28 22:07 ` [PATCH 23/24] PCI: Double checking setting for bus register and bus struct Yinghai Lu
2012-02-28 22:07 ` Yinghai Lu [this message]
2012-02-28 22:07   ` [PATCH 24/24] PCI, pciehp: Remove not needed bus number range checking 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=1330466863-28469-25-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=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --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 \
    --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).