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 part5 6/7] PCI, x86: Move pci_enable_bridges() down
Date: Sun, 2 Sep 2012 14:56:04 -0700 [thread overview]
Message-ID: <1346622965-30937-7-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1346622965-30937-1-git-send-email-yinghai@kernel.org>
After we get hot-added ioapic registered.
pci_enable_bridges will try to enable ioapic irq for pci bridge.
So need to move it down.
Or We can move out pcibios_enable_irq() out of pci_enable_device()
and call pcibios_enable_irq in pci_bus_add_devices ?
also will need to move ...
pcibios_resource_survey_bus(root->bus);
pci_assign_unassigned_bus_resources(root->bus);
to the start add ....
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/acpi/pci_root.c | 3 +++
drivers/pci/probe.c | 1 +
drivers/pci/setup-bus.c | 2 --
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 59aa947..80adbbb 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -646,6 +646,9 @@ static int acpi_pci_root_start(struct acpi_device *device)
if (driver->add)
driver->add(device->handle);
+ /* need to after hot-added ioapic is registered */
+ pci_enable_bridges(root->bus);
+
pci_bus_add_devices(root->bus);
mutex_unlock(&acpi_pci_root_lock);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index dd84224..b18f429 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1909,6 +1909,7 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
max = pci_scan_child_bus(bus);
pci_assign_unassigned_bus_resources(bus);
+ pci_enable_bridges(bus);
pci_bus_add_devices(bus);
return max;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 054d54b..ec10d51 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1527,6 +1527,4 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
up_read(&pci_bus_sem);
__pci_bus_assign_resources(bus, &add_list, NULL);
BUG_ON(!list_empty(&add_list));
-
- pci_enable_bridges(bus);
}
--
1.7.7
next prev parent reply other threads:[~2012-09-02 21:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-02 21:55 [PATCH part5 0/7] PCI, ACPI: pci root bus hotplug support - part5 Yinghai Lu
2012-09-02 21:55 ` [PATCH part5 1/7] ACPI, PCI: Use normal list for struct acpi_pci_driver Yinghai Lu
2012-09-02 21:56 ` [PATCH part5 2/7] ACPI, PCI: Notify acpi_pci_drivers when hot-plugging PCI root bridges Yinghai Lu
2012-09-02 21:56 ` [PATCH part5 3/7] ACPI, PCI: Protect global lists in drivers/acpi/pci_root.c Yinghai Lu
2012-09-02 21:56 ` [PATCH part5 4/7] ACPI, PCI: Stop pci devices before acpi_pci_driver remove calling Yinghai Lu
2012-09-02 21:56 ` [PATCH part5 5/7] PCI: Set dev_node early for pci_dev Yinghai Lu
2012-09-02 21:56 ` Yinghai Lu [this message]
2012-09-02 21:56 ` [PATCH part5 7/7] ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root 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=1346622965-30937-7-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).