mirror of https://lore.kernel.org/lkml/
 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>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 23/24] PCI: make pci_rescan_bus_bridge_resize use pci_scan_bridge instead
Date: Sat,  4 Feb 2012 22:58:07 -0800	[thread overview]
Message-ID: <1328425088-6562-24-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1328425088-6562-1-git-send-email-yinghai@kernel.org>

So after remove all children and then using setpci change bus register and rescan
bridge could use new set bus number.

Otherwise need to rescan parent bus, it would have too much overhead.

also need to use pci_bus_add_single_device to make sure new change bus have directory
 /sys/../.../pci_bus.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/probe.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 61df44d..e85b823 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1972,14 +1972,16 @@ EXPORT_SYMBOL(pci_scan_bus);
  */
 unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge)
 {
-	unsigned int max;
-	struct pci_bus *bus = bridge->subordinate;
+	unsigned int max = 0;
+	int pass;
+	struct pci_bus *bus = bridge->bus;
 
-	max = pci_scan_child_bus(bus);
+	for (pass = 0; pass < 2; pass++)
+		max = pci_scan_bridge(bus, bridge, max, pass);
 
 	pci_assign_unassigned_bridge_resources(bridge);
 
-	pci_bus_add_devices(bus);
+	pci_bus_add_single_device(bridge);
 
 	return max;
 }
-- 
1.7.7


  parent reply	other threads:[~2012-02-05  7:01 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-05  6:57 [PATCH -v5 0/24] PCI: allocate pci bus num range for unassigned bridge busn + pci rescan cleanup Yinghai Lu
2012-02-05  6:57 ` [PATCH 01/24] PCI: Add iobusn_resource Yinghai Lu
2012-02-06 18:48   ` Bjorn Helgaas
2012-02-06 18:55     ` Yinghai Lu
2012-02-10 20:51       ` Jesse Barnes
2012-02-10 23:40         ` Yinghai Lu
2012-02-05  6:57 ` [PATCH 02/24] PCI: add busn inline helper Yinghai Lu
2012-02-05  6:57 ` [PATCH 03/24] Make %pR could handle bus resource with domain Yinghai Lu
2012-02-05  6:57 ` [PATCH 04/24] PCI: Add busn_res operation functions Yinghai Lu
2012-02-06 18:59   ` Bjorn Helgaas
2012-02-06 20:45     ` Yinghai Lu
2012-02-12 23:51       ` Bjorn Helgaas
2012-02-13  0:03         ` Yinghai Lu
2012-02-13  0:11           ` Bjorn Helgaas
2012-02-05  6:57 ` [PATCH 05/24] PCI: add /proc/iobusn Yinghai Lu
2012-02-05  6:57 ` [PATCH 06/24] PCI: Add busn_res tracking in core Yinghai Lu
2012-02-08 16:08   ` Bjorn Helgaas
2012-02-08 17:26     ` Yinghai Lu
2012-02-23 20:20       ` Jesse Barnes
2012-02-05  6:57 ` [PATCH 07/24] PCI, x86: Register busn_res for root buses Yinghai Lu
2012-02-05  6:57 ` [PATCH 08/24] PCI, ia64: " Yinghai Lu
2012-02-05  6:57 ` [PATCH 09/24] PCI, powerpc: " Yinghai Lu
2012-02-08 15:58   ` Bjorn Helgaas
2012-02-08 17:31     ` Yinghai Lu
2012-02-08 22:02     ` Benjamin Herrenschmidt
2012-02-09 19:24       ` Bjorn Helgaas
2012-02-09 21:35         ` Benjamin Herrenschmidt
2012-02-23 20:25           ` Jesse Barnes
2012-02-23 20:51             ` Bjorn Helgaas
2012-02-24 22:24               ` Jesse Barnes
2012-02-25  7:47                 ` Yinghai Lu
2012-02-27 22:44                   ` Bjorn Helgaas
2012-02-05  6:57 ` [PATCH 10/24] PCI, parisc: " Yinghai Lu
2012-02-05  6:57 ` [PATCH 11/24] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-02-05  6:57 ` [PATCH 12/24] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-02-05  6:57 ` [PATCH 13/24] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-02-05  6:57 ` [PATCH 14/24] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-02-05  6:57 ` [PATCH 15/24] PCI: kill pci_fixup_parent_subordinate_busnr() Yinghai Lu
2012-02-05  6:58 ` [PATCH 16/24] PCI: Seperate child bus scanning to two passes overall Yinghai Lu
2012-02-05  6:58 ` [PATCH 17/24] pcmcia: remove workaround for fixing pci parent bus subordinate Yinghai Lu
2012-02-05  6:58 ` [PATCH 18/24] PCI: Double checking setting for bus register and bus struct Yinghai Lu
2012-02-05  6:58 ` [PATCH 19/24] PCI, pciehp: Remove not needed bus number range checking Yinghai Lu
2012-02-05  6:58 ` [PATCH 20/24] PCI, sys: Use device_type and attr_groups with pci dev Yinghai Lu
2012-02-05  6:58 ` [PATCH 21/24] PCI, sysfs: create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-02-05  6:58 ` [PATCH 22/24] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-02-05  6:58 ` Yinghai Lu [this message]
2012-02-05  6:58 ` [PATCH 24/24] PCI: clean up rescan_bus_bridge_resize 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=1328425088-6562-24-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=gregkh@suse.de \
    --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

Powered by JetHome