From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>, Len Brown <lenb@kernel.org>,
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 28/40] PCI, ACPI: Add pci_root_hp hot removal notification support.
Date: Wed, 19 Sep 2012 11:54:42 -0700 [thread overview]
Message-ID: <1348080894-23412-29-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1348080894-23412-1-git-send-email-yinghai@kernel.org>
Add missing hot_remove support for root device.
How to use it?
Find out root bus number to acpi root name mapping from dmesg or /sys
echo "\_SB.PCIB 3" > /sys/kernel/debug/acpi/sci_notify
to remove root bus
-v2: separate stop and remove, so could use acpi_pci_bind_notify()...
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
---
drivers/acpi/pci_root_hp.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/pci_root_hp.c b/drivers/acpi/pci_root_hp.c
index eb4344c..434ee35 100644
--- a/drivers/acpi/pci_root_hp.c
+++ b/drivers/acpi/pci_root_hp.c
@@ -73,6 +73,12 @@ static void add_acpi_root_bridge(acpi_handle handle)
list_add(&bridge->list, &acpi_root_bridge_list);
}
+static void remove_acpi_root_bridge(struct acpi_root_bridge *bridge)
+{
+ list_del(&bridge->list);
+ kfree(bridge);
+}
+
struct acpi_root_hp_work {
struct work_struct work;
acpi_handle handle;
@@ -143,6 +149,61 @@ static void handle_root_bridge_insertion(acpi_handle handle)
printk(KERN_ERR "cannot start bridge\n");
}
+static int acpi_root_evaluate_object(acpi_handle handle, char *cmd, int val)
+{
+ acpi_status status;
+ struct acpi_object_list arg_list;
+ union acpi_object arg;
+
+ arg_list.count = 1;
+ arg_list.pointer = &arg;
+ arg.type = ACPI_TYPE_INTEGER;
+ arg.integer.value = val;
+
+ status = acpi_evaluate_object(handle, cmd, &arg_list, NULL);
+ if (ACPI_FAILURE(status)) {
+ printk(KERN_WARNING "%s: %s to %d failed\n",
+ __func__, cmd, val);
+ return -1;
+ }
+
+ return 0;
+}
+
+static void handle_root_bridge_removal(acpi_handle handle,
+ struct acpi_root_bridge *bridge)
+{
+ u32 flags = 0;
+ struct acpi_device *device;
+
+ if (bridge) {
+ flags = bridge->flags;
+ remove_acpi_root_bridge(bridge);
+ }
+
+ if (!acpi_bus_get_device(handle, &device)) {
+ int ret_val;
+
+ /* remove pci devices at first */
+ ret_val = acpi_bus_trim(device, 0);
+ printk(KERN_DEBUG "acpi_bus_trim stop return %x\n", ret_val);
+
+ /* remove acpi devices */
+ ret_val = acpi_bus_trim(device, 1);
+ printk(KERN_DEBUG "acpi_bus_trim remove return %x\n", ret_val);
+ }
+
+ if (flags & ROOT_BRIDGE_HAS_PS3) {
+ acpi_status status;
+
+ status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
+ if (ACPI_FAILURE(status))
+ printk(KERN_WARNING "%s: _PS3 failed\n", __func__);
+ }
+ if (flags & ROOT_BRIDGE_HAS_EJ0)
+ acpi_root_evaluate_object(handle, "_EJ0", 1);
+}
+
static void _handle_hotplug_event_root(struct work_struct *work)
{
struct acpi_root_bridge *bridge;
@@ -183,6 +244,12 @@ static void _handle_hotplug_event_root(struct work_struct *work)
}
break;
+ case ACPI_NOTIFY_EJECT_REQUEST:
+ /* request device eject */
+ printk(KERN_DEBUG "%s: Device eject notify on %s\n", __func__,
+ objname);
+ handle_root_bridge_removal(handle, bridge);
+ break;
default:
printk(KERN_WARNING "notify_handler: unknown event type 0x%x for %s\n",
type, objname);
--
1.7.7
next prev parent reply other threads:[~2012-09-19 18:55 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-02 21:50 [PATCH part2 0/6] PCI, x86: pci root bus hotplug support - part2 Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 1/6] x86, PCI: Separate pcibios_allocate_bridge_resources() Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 2/6] x86, PCI: Separate pcibios_allocate_dev_resources() Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 3/6] x86, PCI: Let pcibios_allocate_bus_resources() take bus instead Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 4/6] x86, PCI: Separate rom resource claim out Yinghai Lu
2012-09-17 23:38 ` Bjorn Helgaas
2012-09-18 3:18 ` Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 5/6] PCI, x86: Add pcibios_fw_addr_done Yinghai Lu
2012-09-02 21:50 ` [PATCH part2 6/6] PCI: Claim hw/fw allocated resources in hot add path Yinghai Lu
2012-09-18 0:12 ` Bjorn Helgaas
2012-09-18 4:44 ` Yinghai Lu
2012-09-18 5:36 ` Yinghai Lu
2012-09-19 18:54 ` [PATCH 00/40] PCI, ACPI, x86: pci root bus hotplug support Yinghai Lu
2012-09-19 18:54 ` [PATCH 01/40] PCI: fix default vga ref_count Yinghai Lu
2012-09-21 20:52 ` Bjorn Helgaas
2012-09-21 21:18 ` Yinghai Lu
2012-09-23 15:25 ` Jiang Liu
2012-09-19 18:54 ` [PATCH 02/40] PCI, x86: clear initial value for root info resources Yinghai Lu
2012-09-19 18:54 ` [PATCH 03/40] PCI, ia64: " Yinghai Lu
2012-09-19 18:54 ` [PATCH 04/40] PCI, acpiphp: Add is_hotplug_bridge detection Yinghai Lu
2012-09-19 18:54 ` [PATCH 05/40] PCI: Add root bus children dev's res to fail list Yinghai Lu
2012-09-19 18:54 ` [PATCH 06/40] PCI: Split out stop_bus_device and remove_bus_dev again Yinghai Lu
2012-09-19 18:54 ` [PATCH 07/40] x86, PCI: Separate pcibios_allocate_bridge_resources() Yinghai Lu
2012-09-19 18:54 ` [PATCH 08/40] x86, PCI: Separate pcibios_allocate_dev_resources() Yinghai Lu
2012-09-19 18:54 ` [PATCH 09/40] x86, PCI: Let pcibios_allocate_bus_resources() take bus instead Yinghai Lu
2012-09-19 18:54 ` [PATCH 10/40] x86, PCI: Separate rom resource claim out Yinghai Lu
2012-09-19 18:54 ` [PATCH 11/40] PCI, x86: Add pcibios_fw_addr_done Yinghai Lu
2012-09-19 18:54 ` [PATCH 12/40] PCI, x86: Remove __init for hw/fw allocated functions Yinghai Lu
2012-09-19 18:54 ` [PATCH 13/40] PCI: Claim hw/fw allocated resources in hot add path Yinghai Lu
2012-09-19 18:54 ` [PATCH 14/40] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-19 18:54 ` [PATCH 15/40] PCI: Move back pci_rescan_bus() to probe.c Yinghai Lu
2012-09-19 18:54 ` [PATCH 16/40] PCI: pci_bus_size_bridges() should not size own bridge Yinghai Lu
2012-09-19 18:54 ` [PATCH 17/40] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-19 18:54 ` [PATCH 18/40] PCI: Rescan bus using callback method too Yinghai Lu
2012-09-19 18:54 ` [PATCH 19/40] PCI, sysfs: Clean up rescan/remove with schedule_callback Yinghai Lu
2012-09-19 18:54 ` [PATCH 20/40] PCI: Fix a device reference count leakage issue in pci_dev_present() Yinghai Lu
2012-09-19 18:54 ` [PATCH 21/40] PCI: Add pci_stop_and_remove_root_bus() Yinghai Lu
2012-09-19 18:54 ` [PATCH 22/40] PCI, acpiphp: Separate out hot-add support of pci host bridge Yinghai Lu
2012-10-12 10:36 ` Tang Chen
2012-09-19 18:54 ` [PATCH 23/40] PCI, ACPI: Pass device instead of handle when config root bridge Yinghai Lu
2012-09-19 18:54 ` [PATCH 24/40] PCI, acpi: Update acpi_pci_driver add/remove interface Yinghai Lu
2012-09-19 18:54 ` [PATCH 25/40] PCI, ACPI: Make acpi_pci_root_remove remove pci root bus too Yinghai Lu
2012-09-19 18:54 ` [PATCH 26/40] PCI, ACPI: del root bus prt Yinghai Lu
2012-09-19 18:54 ` [PATCH 27/40] ACPI: acpi_bus_trim to support two steps Yinghai Lu
2012-09-19 18:54 ` Yinghai Lu [this message]
2012-09-19 18:54 ` [PATCH 29/40] PCI, ACPI: Add alloc_acpi_hp_work() Yinghai Lu
2012-09-19 18:54 ` [PATCH 30/40] PCI, acpiphp: Use acpi_hp_work Yinghai Lu
2012-09-19 18:54 ` [PATCH 31/40] PCI, pci_root_hp: " Yinghai Lu
2012-09-19 18:54 ` [PATCH 32/40] PCI, ACPI: Make kacpi_hotplug_wq static Yinghai Lu
2012-09-19 18:54 ` [PATCH 33/40] ACPI, PCI: Use normal list for struct acpi_pci_driver Yinghai Lu
2012-09-19 18:54 ` [PATCH 34/40] ACPI, PCI: Notify acpi_pci_drivers when hot-plugging PCI root bridges Yinghai Lu
2012-09-19 18:54 ` [PATCH 35/40] ACPI, PCI: Protect global lists in drivers/acpi/pci_root.c Yinghai Lu
2012-09-19 18:54 ` [PATCH 36/40] PCI: Set dev_node early for pci_dev Yinghai Lu
2012-09-19 18:54 ` [PATCH 37/40] PCI, x86: Move pci_enable_bridges() down Yinghai Lu
2012-09-19 18:54 ` [PATCH 38/40] ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root Yinghai Lu
2012-09-19 18:54 ` [PATCH 39/40] PCI, acpiphp: Don't ailout even no slots found yet Yinghai Lu
2012-09-19 18:54 ` [PATCH 40/40] ACPI: Enable SCI_EMULATE to manually simulate physical hotplug testing Yinghai Lu
2012-10-17 7:50 ` [PATCH 00/40] PCI, ACPI, x86: pci root bus hotplug support Yijing Wang
2012-10-17 16:19 ` Yinghai Lu
2012-10-18 0:51 ` Yijing Wang
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=1348080894-23412-29-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=lenb@kernel.org \
--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
Powered by JetHome