From patchwork Sat Aug 4 12:13:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1273481 Return-Path: X-Original-To: patchwork-linux-acpi@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 EEF2A3FD4F for ; Sat, 4 Aug 2012 12:19:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484Ab2HDMTf (ORCPT ); Sat, 4 Aug 2012 08:19:35 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:51340 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751640Ab2HDMTe (ORCPT ); Sat, 4 Aug 2012 08:19:34 -0400 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AMQ61740; Sat, 04 Aug 2012 20:19:18 +0800 (CST) Received: from SZXEML423-HUB.china.huawei.com (10.82.67.162) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.1.323.3; Sat, 4 Aug 2012 20:14:27 +0800 Received: from localhost (10.108.108.229) by szxeml423-hub.china.huawei.com (10.82.67.162) with Microsoft SMTP Server id 14.1.323.3; Sat, 4 Aug 2012 20:14:24 +0800 From: Jiang Liu To: Yinghai Lu , Yasuaki Ishimatsu , Kenji Kaneshige , Wen Congyang , Tang Chen , Taku Izumi CC: Jiang Liu , Tony Luck , Huang Ying , Bob Moore , Len Brown , "Srivatsa S. Bhat" , Bjorn Helgaas , , , , Jiang Liu , Hanjun Guo , Gaohuai Han Subject: [RFC PATCH v2 07/16] ACPIHP: add callbacks into acpi_device_ops to support new hotplug framework Date: Sat, 4 Aug 2012 20:13:54 +0800 Message-ID: <1344082443-4608-8-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1344082443-4608-1-git-send-email-jiang.liu@huawei.com> References: <1344082443-4608-1-git-send-email-jiang.liu@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.108.108.229] X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Jiang Liu Add new callbacks into struct acpi_device_ops to provide better error handling, error recover and operation cancellation for ACPI based system device hotplug. There are three major operations and each major operation is divided into three steps. 1) pre_configure, configure, post_configure add an ACPI device into running system and rollback if error happens cancelled by user. 2) pre_release, release, post_release reclaim an ACPI device from running system and rollback if error happens or cancelled by user. It's important to privode a mechanism to cancel memory hot-removal operations because it's may take very long or even endless time to reclaim a memory device. 3) pre_unconfigure, unconfigure, post_unconfigure remove an ACPI device from running system and release all resources associated with it. There's another callback to query status and information about the ACPI device. Signed-off-by: Jiang Liu Signed-off-by: Hanjun Guo Signed-off-by: Gaohuai Han --- drivers/acpi/hotplug/device.c | 72 +++++++++++++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 3 ++ include/acpi/acpi_hotplug.h | 64 ++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) diff --git a/drivers/acpi/hotplug/device.c b/drivers/acpi/hotplug/device.c index 1795939..19a9683 100644 --- a/drivers/acpi/hotplug/device.c +++ b/drivers/acpi/hotplug/device.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2011 Huawei Tech. Co., Ltd. * Copyright (C) 2011 Jiang Liu + * Copyright (C) 2011 Hanjun Guo * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -27,6 +28,77 @@ #include #include "../internal.h" +int acpihp_dev_get_info(struct acpi_device *device, + struct acpihp_dev_info *info) +{ + int ret = -ENOSYS; + + acpihp_dev_get_type(device->handle, &info->type); + + mutex_lock(&device->dev.mutex); + if (device->driver && device->driver->ops.hp_ops && + device->driver->ops.hp_ops->get_info) + ret = device->driver->ops.hp_ops->get_info(device, info); + else +#if 0 + /* Turn on this once all system devices have been converted + * to the new hotplug framework + */ + info->status |= ACPIHP_DEV_STATUS_IRREMOVABLE; +#else + ret = 0; +#endif + + if (device->driver) + info->status |= ACPIHP_DEV_STATUS_ATTACHED; + mutex_unlock(&device->dev.mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(acpihp_dev_get_info); + +#define ACPIHP_DEFINE_FUNC(method, def, err) \ +int acpihp_dev_##method(struct acpi_device *device) \ +{ \ + int ret; \ + BUG_ON(device == NULL); \ + if (!device->driver || !device->driver->ops.hp_ops) \ + ret = (err); \ + else if (!device->driver->ops.hp_ops->method) \ + ret = (def); \ + else \ + ret = device->driver->ops.hp_ops->method(device);\ + return ret; \ +} \ +EXPORT_SYMBOL_GPL(acpihp_dev_##method) + +#define ACPIHP_DEFINE_FUNC1(method, def, err, type) \ +int acpihp_dev_##method(struct acpi_device *device, type val) \ +{ \ + int ret; \ + BUG_ON(device == NULL); \ + if (!device->driver || !device->driver->ops.hp_ops) \ + ret = (err); \ + else if (!device->driver->ops.hp_ops->method) \ + ret = (def); \ + else \ + ret = device->driver->ops.hp_ops->method(device, val); \ + return ret; \ +} \ +EXPORT_SYMBOL_GPL(acpihp_dev_##method) + +ACPIHP_DEFINE_FUNC1(pre_configure, 0, 0, struct acpihp_cancel_context *); +ACPIHP_DEFINE_FUNC1(configure, 0, -ENOSYS, struct acpihp_cancel_context *); +ACPIHP_DEFINE_FUNC1(post_configure, 0, 0, enum acpihp_dev_post_cmd); + +ACPIHP_DEFINE_FUNC1(pre_release, 0, 0, struct acpihp_cancel_context *); +ACPIHP_DEFINE_FUNC1(release, 0, 0, struct acpihp_cancel_context *); +ACPIHP_DEFINE_FUNC1(post_release, 0, 0, enum acpihp_dev_post_cmd); + +ACPIHP_DEFINE_FUNC(pre_unconfigure, 0, 0); +ACPIHP_DEFINE_FUNC(unconfigure, 0, -ENOSYS); +ACPIHP_DEFINE_FUNC(post_unconfigure, 0, 0); + /* * When creating ACPI devices for hot-added system devices connecting to slot, * we shouldn't cross the slot boundary. Otherwise it will cause inconsistence diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 81b4c3f..09bfa80 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -140,6 +140,9 @@ struct acpi_device_ops { acpi_op_bind bind; acpi_op_unbind unbind; acpi_op_notify notify; +#ifdef CONFIG_ACPI_HOTPLUG + struct acpihp_dev_ops *hp_ops; +#endif /* CONFIG_ACPI_HOTPLUG */ }; #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */ diff --git a/include/acpi/acpi_hotplug.h b/include/acpi/acpi_hotplug.h index cd8dd99..2589ccb 100644 --- a/include/acpi/acpi_hotplug.h +++ b/include/acpi/acpi_hotplug.h @@ -66,6 +66,51 @@ struct acpihp_dev_node { struct klist_node node; }; +/* Status of system devices. */ +#define ACPIHP_DEV_STATUS_ATTACHED 0x1 /* Device driver attached */ +#define ACPIHP_DEV_STATUS_STARTED 0x2 /* Device started */ +#define ACPIHP_DEV_STATUS_IRREMOVABLE 0x10000 /* Device can't be removed */ +#define ACPIHP_DEV_STATUS_FAULT 0x20000 /* Device in fault status */ + +struct acpihp_dev_info { + enum acpihp_dev_type type; + uint32_t status; +}; + +/* Rollback or commit changes in post_{confiure|release} */ +enum acpihp_dev_post_cmd { + ACPIHP_DEV_POST_CMD_ROLLBACK, + ACPIHP_DEV_POST_CMD_COMMIT +}; + +/* + * ACPI system device drivers may check cancellations of hotplug operations + * by invoking the callback. + */ +struct acpihp_cancel_context { + int (*check_cancel)(struct acpihp_cancel_context *ctx); +}; + +/* + * Callback hooks provided by ACPI device drivers to support system device + * hotplug. To support hotplug, an ACPI system device driver must implement + * configure(), unconfigure() and get_info() at least. + */ +struct acpihp_dev_ops { + int (*get_info)(struct acpi_device *, struct acpihp_dev_info *info); + int (*pre_configure)(struct acpi_device *, + struct acpihp_cancel_context *); + int (*configure)(struct acpi_device *, struct acpihp_cancel_context *); + int (*post_configure)(struct acpi_device *, enum acpihp_dev_post_cmd); + int (*pre_release)(struct acpi_device *, + struct acpihp_cancel_context *); + int (*release)(struct acpi_device *, struct acpihp_cancel_context *); + int (*post_release)(struct acpi_device *, enum acpihp_dev_post_cmd); + int (*pre_unconfigure)(struct acpi_device *); + int (*unconfigure)(struct acpi_device *); + int (*post_unconfigure)(struct acpi_device *); +}; + /* * ACPI hotplug slot is an abstraction of receptacles where a group of * system devices could be attached, just like PCI slot in PCI hotplug. @@ -165,6 +210,25 @@ extern int acpihp_register_class(void); /* Unregister the ACPI hotplug slot class driver */ extern void acpihp_unregister_class(void); +/* Interfaces to invoke the ACPI device driver's hotplug hooks. */ +extern int acpihp_dev_get_info(struct acpi_device *device, + struct acpihp_dev_info *info); +extern int acpihp_dev_pre_configure(struct acpi_device *device, + struct acpihp_cancel_context *ctx); +extern int acpihp_dev_configure(struct acpi_device *device, + struct acpihp_cancel_context *ctx); +extern int acpihp_dev_post_configure(struct acpi_device *device, + enum acpihp_dev_post_cmd cmd); +extern int acpihp_dev_pre_release(struct acpi_device *device, + struct acpihp_cancel_context *ctx); +extern int acpihp_dev_release(struct acpi_device *device, + struct acpihp_cancel_context *ctx); +extern int acpihp_dev_post_release(struct acpi_device *device, + enum acpihp_dev_post_cmd cmd); +extern int acpihp_dev_pre_unconfigure(struct acpi_device *device); +extern int acpihp_dev_unconfigure(struct acpi_device *device); +extern int acpihp_dev_post_unconfigure(struct acpi_device *device); + /* Utility routines */ extern int acpihp_dev_get_type(acpi_handle handle, enum acpihp_dev_type *type); extern bool acpihp_dev_match_ids(struct acpi_device_info *infop, char **ids);