From: Toshi Kani <toshi.kani@hp.com>
To: rjw@sisk.pl, lenb@kernel.org, gregkh@linuxfoundation.org,
akpm@linux-foundation.org
Cc: linux-s390@vger.kernel.org, Toshi Kani <toshi.kani@hp.com>,
jiang.liu@huawei.com, wency@cn.fujitsu.com, linux-mm@kvack.org,
yinghai@kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, isimatu.yasuaki@jp.fujitsu.com,
srivatsa.bhat@linux.vnet.ibm.com, guohanjun@huawei.com,
bhelgaas@google.com, linuxppc-dev@lists.ozlabs.org
Subject: [RFC PATCH v2 06/12] ACPI: Add ACPI bus hotplug handlers
Date: Thu, 10 Jan 2013 16:40:24 -0700 [thread overview]
Message-ID: <1357861230-29549-7-git-send-email-toshi.kani@hp.com> (raw)
In-Reply-To: <1357861230-29549-1-git-send-email-toshi.kani@hp.com>
Added ACPI bus hotplug handlers. acpi_add_execute() calls
acpi_bus_add() to construct new acpi_device objects for hot-add
operation, and acpi_del_execute() calls acpi_bus_trim() to destruct
them for hot-delete operation. They are also used for rollback
as well.
acpi_del_commit() calls _EJ0 to eject a target object for hot-delete.
acpi_validate_ost() calls _OST to inform FW that a hot-plug operation
completed with error in case of rollback.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
---
drivers/acpi/bus.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 1f0d457..31a1911 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -42,6 +42,7 @@
#include <acpi/apei.h>
#include <linux/dmi.h>
#include <linux/suspend.h>
+#include <acpi/sys_hotplug.h>
#include "internal.h"
@@ -52,6 +53,9 @@ struct acpi_device *acpi_root;
struct proc_dir_entry *acpi_root_dir;
EXPORT_SYMBOL(acpi_root_dir);
+static int acpi_add_execute(struct shp_request *req, int rollback);
+static int acpi_del_execute(struct shp_request *req, int rollback);
+
#define STRUCT_TO_INT(s) (*((int*)&s))
@@ -859,6 +863,134 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
}
/* --------------------------------------------------------------------------
+ Hot-plug Handling
+ -------------------------------------------------------------------------- */
+
+static int acpi_validate_ost(struct shp_request *req, int rollback)
+{
+ /* If hotplug request failed, inform firmware with error */
+ if (rollback && shp_is_hotplug_op(req->operation))
+ (void) acpi_evaluate_hotplug_ost(req->handle, req->event,
+ ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
+
+ return 0;
+}
+
+static int acpi_add_execute(struct shp_request *req, int rollback)
+{
+ acpi_handle handle = (acpi_handle) req->handle;
+ acpi_handle phandle;
+ struct acpi_device *device = NULL;
+ struct acpi_device *pdev;
+ int ret;
+
+ if (rollback)
+ return acpi_del_execute(req, 0);
+
+ /* only handle hot-plug operation */
+ if (!shp_is_hotplug_op(req->operation))
+ return 0;
+
+ if (acpi_get_parent(handle, &phandle))
+ return -ENODEV;
+
+ if (acpi_bus_get_device(phandle, &pdev))
+ return -ENODEV;
+
+ ret = acpi_bus_add(&device, pdev, handle, ACPI_BUS_TYPE_DEVICE);
+
+ return ret;
+}
+
+static int acpi_add_commit(struct shp_request *req, int rollback)
+{
+ /* Inform firmware that the hotplug operation has completed */
+ (void) acpi_evaluate_hotplug_ost(req->handle, req->event,
+ ACPI_OST_SC_SUCCESS, NULL);
+
+ return 0;
+}
+
+static int acpi_del_execute(struct shp_request *req, int rollback)
+{
+ acpi_handle handle = (acpi_handle) req->handle;
+ struct acpi_device *device;
+
+ if (rollback)
+ return acpi_add_execute(req, 0);
+
+ /* only handle hot-plug operation */
+ if (!shp_is_hotplug_op(req->operation))
+ return 0;
+
+ if (acpi_bus_get_device(handle, &device)) {
+ acpi_handle_err(handle, "Failed to obtain device\n");
+ return -EINVAL;
+ }
+
+ if (acpi_bus_trim(device, 1)) {
+ dev_err(&device->dev, "Removing device failed\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int acpi_del_commit(struct shp_request *req, int rollback)
+{
+ acpi_handle handle = (acpi_handle) req->handle;
+ acpi_handle temp;
+ struct acpi_object_list arg_list;
+ union acpi_object arg;
+ acpi_status status;
+
+ /* only handle hot-plug operation */
+ if (!shp_is_hotplug_op(req->operation))
+ return 0;
+
+ /* power off device */
+ status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
+ if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+ acpi_handle_warn(handle, "Power-off device failed\n");
+
+ if (ACPI_SUCCESS(acpi_get_handle(handle, "_LCK", &temp))) {
+ arg_list.count = 1;
+ arg_list.pointer = &arg;
+ arg.type = ACPI_TYPE_INTEGER;
+ arg.integer.value = 0;
+ acpi_evaluate_object(handle, "_LCK", &arg_list, NULL);
+ }
+
+ arg_list.count = 1;
+ arg_list.pointer = &arg;
+ arg.type = ACPI_TYPE_INTEGER;
+ arg.integer.value = 1;
+
+ status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
+ if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND))
+ acpi_handle_warn(handle, "Eject device failed\n");
+
+ return 0;
+}
+
+static void __init acpi_shp_init(void)
+{
+ shp_register_handler(SHP_ADD_VALIDATE, acpi_validate_ost,
+ SHP_ACPI_BUS_ADD_VALIDATE_ORDER);
+ shp_register_handler(SHP_ADD_EXECUTE, acpi_add_execute,
+ SHP_ACPI_BUS_ADD_EXECUTE_ORDER);
+ shp_register_handler(SHP_ADD_COMMIT, acpi_add_commit,
+ SHP_ACPI_BUS_ADD_COMMIT_ORDER);
+
+ shp_register_handler(SHP_DEL_VALIDATE, acpi_validate_ost,
+ SHP_ACPI_BUS_DEL_VALIDATE_ORDER);
+ shp_register_handler(SHP_DEL_EXECUTE, acpi_del_execute,
+ SHP_ACPI_BUS_DEL_EXECUTE_ORDER);
+ shp_register_handler(SHP_DEL_COMMIT, acpi_del_commit,
+ SHP_ACPI_BUS_DEL_COMMIT_ORDER);
+}
+
+/* --------------------------------------------------------------------------
Initialization/Cleanup
-------------------------------------------------------------------------- */
@@ -1103,6 +1235,7 @@ static int __init acpi_init(void)
acpi_debugfs_init();
acpi_sleep_proc_init();
acpi_wakeup_device_init();
+ acpi_shp_init();
return 0;
}
next prev parent reply other threads:[~2013-01-11 0:00 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 23:40 [RFC PATCH v2 00/12] System device hot-plug framework Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 01/12] Add sys_hotplug.h for system device hotplug framework Toshi Kani
2013-01-11 21:23 ` Rafael J. Wysocki
2013-01-14 15:33 ` Toshi Kani
2013-01-14 18:48 ` Rafael J. Wysocki
2013-01-14 19:02 ` Toshi Kani
2013-01-30 4:48 ` Greg KH
2013-01-31 1:15 ` Toshi Kani
2013-01-31 5:24 ` Greg KH
2013-01-31 14:42 ` Toshi Kani
2013-01-30 4:53 ` Greg KH
2013-01-31 1:46 ` Toshi Kani
2013-01-30 4:58 ` Greg KH
2013-01-31 2:57 ` Toshi Kani
2013-01-31 20:54 ` Rafael J. Wysocki
2013-02-01 1:32 ` Toshi Kani
2013-02-01 7:30 ` Greg KH
2013-02-01 20:40 ` Toshi Kani
2013-02-01 22:21 ` Rafael J. Wysocki
2013-02-01 23:12 ` Toshi Kani
2013-02-02 15:01 ` Greg KH
2013-02-04 0:28 ` Toshi Kani
2013-02-04 12:46 ` Greg KH
2013-02-04 16:46 ` Toshi Kani
2013-02-04 19:45 ` Rafael J. Wysocki
2013-02-04 20:59 ` Toshi Kani
2013-02-04 23:23 ` Rafael J. Wysocki
2013-02-04 23:33 ` Toshi Kani
2013-02-01 7:23 ` Greg KH
2013-02-01 22:12 ` Rafael J. Wysocki
2013-02-02 14:58 ` Greg KH
2013-02-02 20:15 ` Rafael J. Wysocki
2013-02-02 22:18 ` [PATCH?] Move ACPI device nodes under /sys/firmware/acpi (was: Re: [RFC PATCH v2 01/12] Add sys_hotplug.h for system device hotplug framework) Rafael J. Wysocki
2013-02-04 1:24 ` Greg KH
2013-02-04 12:34 ` Rafael J. Wysocki
2013-02-03 20:44 ` [RFC PATCH v2 01/12] Add sys_hotplug.h for system device hotplug framework Rafael J. Wysocki
2013-02-04 12:48 ` Greg KH
2013-02-04 14:21 ` Rafael J. Wysocki
2013-02-04 14:33 ` Greg KH
2013-02-04 20:07 ` Rafael J. Wysocki
2013-02-04 22:13 ` Toshi Kani
2013-02-04 23:52 ` Rafael J. Wysocki
2013-02-05 0:04 ` Greg KH
2013-02-05 1:02 ` Rafael J. Wysocki
2013-02-05 11:11 ` Rafael J. Wysocki
2013-02-05 18:39 ` Greg KH
2013-02-05 21:13 ` Rafael J. Wysocki
2013-02-05 0:55 ` Toshi Kani
2013-02-04 16:19 ` Toshi Kani
2013-02-04 19:43 ` Rafael J. Wysocki
2013-02-04 1:23 ` Greg KH
2013-02-04 13:41 ` Rafael J. Wysocki
2013-02-04 16:02 ` Toshi Kani
2013-02-04 19:48 ` Rafael J. Wysocki
2013-02-04 19:46 ` Toshi Kani
2013-02-04 20:12 ` Rafael J. Wysocki
2013-02-04 20:34 ` Toshi Kani
2013-02-04 23:19 ` Rafael J. Wysocki
2013-01-10 23:40 ` [RFC PATCH v2 02/12] ACPI: " Toshi Kani
2013-01-11 21:25 ` Rafael J. Wysocki
2013-01-14 15:53 ` Toshi Kani
2013-01-14 18:47 ` Rafael J. Wysocki
2013-01-14 18:42 ` Toshi Kani
2013-01-14 19:07 ` Rafael J. Wysocki
2013-01-14 19:21 ` Toshi Kani
2013-01-30 4:51 ` Greg KH
2013-01-31 1:38 ` Toshi Kani
2013-01-14 19:21 ` Greg KH
2013-01-14 19:29 ` Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 03/12] drivers/base: Add " Toshi Kani
2013-01-30 4:54 ` Greg KH
2013-01-31 1:48 ` Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 04/12] cpu: Add cpu hotplug handlers Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 05/12] mm: Add memory " Toshi Kani
2013-01-10 23:40 ` Toshi Kani [this message]
2013-01-10 23:40 ` [RFC PATCH v2 07/12] ACPI: Add ACPI resource hotplug handler Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 08/12] ACPI: Update processor driver for hotplug framework Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 09/12] ACPI: Update memory " Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 10/12] ACPI: Update container " Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 11/12] cpu: Update sysfs cpu/online " Toshi Kani
2013-01-10 23:40 ` [RFC PATCH v2 12/12] ACPI: Update sysfs eject " Toshi Kani
2013-01-17 0:50 ` [RFC PATCH v2 00/12] System device hot-plug framework Rafael J. Wysocki
2013-01-17 17:59 ` Toshi Kani
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=1357861230-29549-7-git-send-email-toshi.kani@hp.com \
--to=toshi.kani@hp.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=isimatu.yasuaki@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-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=rjw@sisk.pl \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=wency@cn.fujitsu.com \
--cc=yinghai@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).