From patchwork Wed Sep 19 18:54:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 1479431 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0A873DF280 for ; Wed, 19 Sep 2012 18:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757037Ab2ISSzi (ORCPT ); Wed, 19 Sep 2012 14:55:38 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:48061 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757017Ab2ISSzd (ORCPT ); Wed, 19 Sep 2012 14:55:33 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q8JItNUW029863 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 19 Sep 2012 18:55:24 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q8JItLav012536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 19 Sep 2012 18:55:22 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q8JItLfD013550; Wed, 19 Sep 2012 13:55:21 -0500 Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 19 Sep 2012 11:55:21 -0700 From: Yinghai Lu To: Bjorn Helgaas , Len Brown , Taku Izumi , Jiang Liu , x86 Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Subject: [PATCH 28/40] PCI, ACPI: Add pci_root_hp hot removal notification support. Date: Wed, 19 Sep 2012 11:54:42 -0700 Message-Id: <1348080894-23412-29-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1348080894-23412-1-git-send-email-yinghai@kernel.org> References: <1348080894-23412-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.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 Cc: Len Brown 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);