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 7/7] ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root
Date: Sun, 2 Sep 2012 14:56:05 -0700 [thread overview]
Message-ID: <1346622965-30937-8-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1346622965-30937-1-git-send-email-yinghai@kernel.org>
Pre-installed will be handled later, need to skip the one only for hot-added
roots.
Otherwise will get anonying failing message about can not reserve, irq ...
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/acpi/pci_root.c | 3 ++-
drivers/acpi/pci_root_hp.c | 1 +
include/acpi/acpi_bus.h | 1 +
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 80adbbb..576fe9a 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -647,7 +647,8 @@ static int acpi_pci_root_start(struct acpi_device *device)
driver->add(device->handle);
/* need to after hot-added ioapic is registered */
- pci_enable_bridges(root->bus);
+ if (root->hot_added)
+ pci_enable_bridges(root->bus);
pci_bus_add_devices(root->bus);
mutex_unlock(&acpi_pci_root_lock);
diff --git a/drivers/acpi/pci_root_hp.c b/drivers/acpi/pci_root_hp.c
index d2ace81..2800fb4 100644
--- a/drivers/acpi/pci_root_hp.c
+++ b/drivers/acpi/pci_root_hp.c
@@ -86,6 +86,7 @@ static void acpi_root_configure_bridge(acpi_handle handle)
pcibios_resource_survey_bus(root->bus);
pci_assign_unassigned_bus_resources(root->bus);
+ root->hot_added = true;
}
static void handle_root_bridge_insertion(acpi_handle handle)
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index bde976e..47de196 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -406,6 +406,7 @@ struct acpi_pci_root {
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
+ bool hot_added;
phys_addr_t mcfg_addr;
};
--
1.7.7
prev parent reply other threads:[~2012-09-02 21:56 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 ` [PATCH part5 6/7] PCI, x86: Move pci_enable_bridges() down Yinghai Lu
2012-09-02 21:56 ` Yinghai Lu [this message]
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-8-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).