From patchwork Sun Nov 4 15:08:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1694361 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D11D23FD8C for ; Sun, 4 Nov 2012 15:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754835Ab2KDPIv (ORCPT ); Sun, 4 Nov 2012 10:08:51 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:39930 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922Ab2KDPIq (ORCPT ); Sun, 4 Nov 2012 10:08:46 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so3381938pad.19 for ; Sun, 04 Nov 2012 07:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7pSiN68sIZt8wsrZpgmS7m8UUYJ2LXdImIgkkTWqE1c=; b=p/IJVarMH8rh0Vgq8q4lYsITb901BaH9J+GI9Tc+z0NH9NcvWDgvWK766LFvL1KH2m HUvmpBhcO+kepX9pDAvaVUQiFUq6ED1Ss/O5eh6ZHIyXNwvFm0eYtU3tXNsYZ8G1PueN qqyXkg5dM4RYZ17u0nSOMSpXyMOqHNr0+CadGPNYQA2hWCcYMj4mLtTWfKyi8g+VNMA0 1BqQGTrV25rDALEMMg9X2gqtSJkMA8NFn+SKkQzeXjfAxf66RHq2tvZQBwKf6n4p62E2 s1Q7r3ZbOVY3xSZjDX3KYwmz1mj/IVnXIX4sYApmKUMrh373PIWR6j1oB46XRZNjcVtz D48g== Received: by 10.66.81.138 with SMTP id a10mr21146623pay.53.1352041725904; Sun, 04 Nov 2012 07:08:45 -0800 (PST) Received: from localhost.localdomain ([120.196.98.117]) by mx.google.com with ESMTPS id mn5sm9018832pbc.12.2012.11.04.07.08.36 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 04 Nov 2012 07:08:45 -0800 (PST) From: Jiang Liu To: "Rafael J . Wysocki" , Yinghai Lu , Tony Luck , Yasuaki Ishimatsu , Wen Congyang , Tang Chen , Taku Izumi , Bjorn Helgaas Cc: Jiang Liu , Kenji Kaneshige , Huang Ying , Bob Moore , Len Brown , "Srivatsa S . Bhat" , Yijing Wang , Hanjun Guo , Jiang Liu , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org Subject: [ACPIHP PATCH part3 1/2] ACPIHP: enhance ACPI container driver to support new hotplug framework Date: Sun, 4 Nov 2012 23:08:17 +0800 Message-Id: <1352041698-6243-2-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352041698-6243-1-git-send-email-jiang.liu@huawei.com> References: <1352041698-6243-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org With the new ACPI system device hotplug framework, ACPI device driver doesn't need to handle hotplug events any more and only need to provide callbacks for the framework to configure/unconfigure system devices. So this patch makes following changes to the ACPI container driver: 1) Remove code to handle ACPI hotplug event from the container driver. 2) Add callbacks to configure/unconfigure container device. Actually all callbacks are NOOP because ACPI container devices are just container to host really ACPI devices. Signed-off-by: Jiang Liu --- drivers/acpi/Kconfig | 7 +- drivers/acpi/container.c | 224 ++++++---------------------------------------- include/acpi/container.h | 12 --- 3 files changed, 30 insertions(+), 213 deletions(-) delete mode 100644 include/acpi/container.h diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 185ab1d..05f0a22 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -380,13 +380,14 @@ config ACPI_HOTPLUG_DRIVER config ACPI_CONTAINER tristate "Container and Module Devices (EXPERIMENTAL)" - depends on EXPERIMENTAL - default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) + depends on ACPI_HOTPLUG + default y help This driver supports ACPI Container and Module devices (IDs ACPI0004, PNP0A05, and PNP0A06). - This helps support hotplug of nodes, CPUs, and memory. + This helps support hotplug of nodes, CPUs, memory and PCI host + bridges. To compile this driver as a module, choose M here: the module will be called container. diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 1f9f7d7..ed1e59f 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -7,6 +7,7 @@ * Copyright (C) 2004 Motoyuki Ito (motoyuki@soft.fujitsu.com) * Copyright (C) 2004 Intel Corp. * Copyright (C) 2004 FUJITSU LIMITED + * Copyright (C) 2012 Jiang Liu (jiang.liu@huawei.com) * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -34,16 +35,13 @@ #include #include #include -#include +#include #define PREFIX "ACPI: " #define ACPI_CONTAINER_DEVICE_NAME "ACPI container device" #define ACPI_CONTAINER_CLASS "container" -#define INSTALL_NOTIFY_HANDLER 1 -#define UNINSTALL_NOTIFY_HANDLER 2 - #define _COMPONENT ACPI_CONTAINER_COMPONENT ACPI_MODULE_NAME("container"); @@ -54,6 +52,18 @@ MODULE_LICENSE("GPL"); static int acpi_container_add(struct acpi_device *device); static int acpi_container_remove(struct acpi_device *device, int type); +static int acpihp_container_get_devinfo(struct acpi_device *device, + struct acpihp_dev_info *info); +static int acpihp_container_configure(struct acpi_device *device, + struct acpihp_cancel_context *argp); +static void acpihp_container_unconfigure(struct acpi_device *device); + +struct acpihp_dev_ops acpihp_container_ops = { + .get_info = acpihp_container_get_devinfo, + .configure = acpihp_container_configure, + .unconfigure = acpihp_container_unconfigure, +}; + static const struct acpi_device_id container_device_ids[] = { {"ACPI0004", 0}, {"PNP0A05", 0}, @@ -69,49 +79,19 @@ static struct acpi_driver acpi_container_driver = { .ops = { .add = acpi_container_add, .remove = acpi_container_remove, - }, + .hp_ops = &acpihp_container_ops, + }, }; -/*******************************************************************/ - -static int is_device_present(acpi_handle handle) -{ - acpi_handle temp; - acpi_status status; - unsigned long long sta; - - - status = acpi_get_handle(handle, "_STA", &temp); - if (ACPI_FAILURE(status)) - return 1; /* _STA not found, assume device present */ - - status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); - if (ACPI_FAILURE(status)) - return 0; /* Firmware error */ - - return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT); -} - -/*******************************************************************/ static int acpi_container_add(struct acpi_device *device) { - struct acpi_container *container; - - if (!device) { printk(KERN_ERR PREFIX "device is NULL\n"); return -EINVAL; } - container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL); - if (!container) - return -ENOMEM; - - container->handle = device->handle; strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS); - device->driver_data = container; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device <%s> bid <%s>\n", acpi_device_name(device), acpi_device_bid(device))); @@ -120,177 +100,25 @@ static int acpi_container_add(struct acpi_device *device) static int acpi_container_remove(struct acpi_device *device, int type) { - acpi_status status = AE_OK; - struct acpi_container *pc = NULL; - - pc = acpi_driver_data(device); - kfree(pc); - return status; -} - -static int container_device_add(struct acpi_device **device, acpi_handle handle) -{ - acpi_handle phandle; - struct acpi_device *pdev; - int result; - - - if (acpi_get_parent(handle, &phandle)) { - return -ENODEV; - } - - if (acpi_bus_get_device(phandle, &pdev)) { - return -ENODEV; - } - - if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_DEVICE)) { - return -ENODEV; - } - - result = acpi_bus_start(*device); - - return result; -} - -static void container_notify_cb(acpi_handle handle, u32 type, void *context) -{ - struct acpi_device *device = NULL; - int result; - int present; - acpi_status status; - u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */ - - switch (type) { - case ACPI_NOTIFY_BUS_CHECK: - /* Fall through */ - case ACPI_NOTIFY_DEVICE_CHECK: - printk(KERN_WARNING "Container driver received %s event\n", - (type == ACPI_NOTIFY_BUS_CHECK) ? - "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"); - - present = is_device_present(handle); - status = acpi_bus_get_device(handle, &device); - if (!present) { - if (ACPI_SUCCESS(status)) { - /* device exist and this is a remove request */ - device->flags.eject_pending = 1; - kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE); - return; - } - break; - } - - if (!ACPI_FAILURE(status) || device) - break; - - result = container_device_add(&device, handle); - if (result) { - printk(KERN_WARNING "Failed to add container\n"); - break; - } - - kobject_uevent(&device->dev.kobj, KOBJ_ONLINE); - ost_code = ACPI_OST_SC_SUCCESS; - break; - - case ACPI_NOTIFY_EJECT_REQUEST: - if (!acpi_bus_get_device(handle, &device) && device) { - device->flags.eject_pending = 1; - kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE); - return; - } - break; - - default: - /* non-hotplug event; possibly handled by other handler */ - return; - } - - /* Inform firmware that the hotplug operation has completed */ - (void) acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL); - return; + return AE_OK; } -static acpi_status -container_walk_namespace_cb(acpi_handle handle, - u32 lvl, void *context, void **rv) +static int acpihp_container_get_devinfo(struct acpi_device *device, + struct acpihp_dev_info *info) { - char *hid = NULL; - struct acpi_device_info *info; - acpi_status status; - int *action = context; - - status = acpi_get_object_info(handle, &info); - if (ACPI_FAILURE(status)) { - return AE_OK; - } + info->type = ACPIHP_DEV_TYPE_CONTAINER; - if (info->valid & ACPI_VALID_HID) - hid = info->hardware_id.string; - - if (hid == NULL) { - goto end; - } - - if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") && - strcmp(hid, "PNP0A06")) { - goto end; - } - - switch (*action) { - case INSTALL_NOTIFY_HANDLER: - acpi_install_notify_handler(handle, - ACPI_SYSTEM_NOTIFY, - container_notify_cb, NULL); - break; - case UNINSTALL_NOTIFY_HANDLER: - acpi_remove_notify_handler(handle, - ACPI_SYSTEM_NOTIFY, - container_notify_cb); - break; - default: - break; - } - - end: - kfree(info); - - return AE_OK; + return 0; } -static int __init acpi_container_init(void) +static int acpihp_container_configure(struct acpi_device *device, + struct acpihp_cancel_context *argp) { - int result = 0; - int action = INSTALL_NOTIFY_HANDLER; - - result = acpi_bus_register_driver(&acpi_container_driver); - if (result < 0) { - return (result); - } - - /* register notify handler to every container device */ - acpi_walk_namespace(ACPI_TYPE_DEVICE, - ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, - container_walk_namespace_cb, NULL, &action, NULL); - - return (0); + return 0; } -static void __exit acpi_container_exit(void) +static void acpihp_container_unconfigure(struct acpi_device *device) { - int action = UNINSTALL_NOTIFY_HANDLER; - - - acpi_walk_namespace(ACPI_TYPE_DEVICE, - ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, - container_walk_namespace_cb, NULL, &action, NULL); - - acpi_bus_unregister_driver(&acpi_container_driver); - - return; } -module_init(acpi_container_init); -module_exit(acpi_container_exit); +module_acpi_driver(acpi_container_driver); diff --git a/include/acpi/container.h b/include/acpi/container.h deleted file mode 100644 index a703f14..0000000 --- a/include/acpi/container.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __ACPI_CONTAINER_H -#define __ACPI_CONTAINER_H - -#include - -struct acpi_container { - acpi_handle handle; - unsigned long sun; - int state; -}; - -#endif /* __ACPI_CONTAINER_H */