From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
Jiang Liu <jiang.liu@huawei.com>, x86 <x86@kernel.org>
Cc: 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-acpi@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH part3 08/11] PCI: Make pci_rescan_bus_bridge_resize() use pci_scan_bridge
Date: Sun, 2 Sep 2012 14:52:18 -0700 [thread overview]
Message-ID: <1346622741-30799-9-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1346622741-30799-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 d1796fe..59345ac 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1879,14 +1879,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
next prev parent reply other threads:[~2012-09-02 21:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-02 21:52 [PATCH part3 00/11] PCI, x86: pci root bus hotplug support - part3 Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 01/11] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 02/11] PCI: Move back pci_rescan_bus() to probe.c Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 03/11] PCI: pci_bus_size_bridges() should not size own bridge Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 04/11] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 05/11] PCI, sysfs: Use device_type and attr_groups with pci dev Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 06/11] PCI, sysfs: Create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 07/11] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-09-02 21:52 ` Yinghai Lu [this message]
2012-09-02 21:52 ` [PATCH part3 09/11] PCI: Clean up rescan_bus_bridge_resize() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 10/11] PCI: Rescan bus or bridge using callback method too Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 11/11] PCI, sysfs: Clean up rescan/remove with scheule_callback 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=1346622741-30799-9-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--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).