From: Toshi Kani <toshi.kani@hp.com>
To: rjw@sisk.pl, lenb@kernel.org, gregkh@linuxfoundation.org,
akpm@linux-foundation.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, bhelgaas@google.com,
isimatu.yasuaki@jp.fujitsu.com, jiang.liu@huawei.com,
wency@cn.fujitsu.com, guohanjun@huawei.com, yinghai@kernel.org,
srivatsa.bhat@linux.vnet.ibm.com, Toshi Kani <toshi.kani@hp.com>
Subject: [RFC PATCH 05/11] ACPI: Add ACPI bus hotplug handlers
Date: Wed, 12 Dec 2012 16:17:17 -0700 [thread overview]
Message-ID: <1355354243-18657-6-git-send-email-toshi.kani@hp.com> (raw)
In-Reply-To: <1355354243-18657-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_rollback_ost() calls _OST to inform FW that a hot-plug operation
completed with error in case of failure.
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..341db34 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 <linux/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 hp_request *req, int rollback);
+static int acpi_del_execute(struct hp_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_rollback_ost(struct hp_request *req, int rollback)
+{
+ /* If hotplug request failed, inform firmware with error */
+ if (rollback && hp_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 hp_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 (!hp_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 hp_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 hp_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 (!hp_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 hp_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 (!hp_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_hp_init(void)
+{
+ hp_register_handler(HP_ADD_VALIDATE, acpi_rollback_ost,
+ HP_ACPI_BUS_ADD_VALIDATE_ORDER);
+ hp_register_handler(HP_ADD_EXECUTE, acpi_add_execute,
+ HP_ACPI_BUS_ADD_EXECUTE_ORDER);
+ hp_register_handler(HP_ADD_COMMIT, acpi_add_commit,
+ HP_ACPI_BUS_ADD_COMMIT_ORDER);
+
+ hp_register_handler(HP_DEL_VALIDATE, acpi_rollback_ost,
+ HP_ACPI_BUS_DEL_VALIDATE_ORDER);
+ hp_register_handler(HP_DEL_EXECUTE, acpi_del_execute,
+ HP_ACPI_BUS_DEL_EXECUTE_ORDER);
+ hp_register_handler(HP_DEL_COMMIT, acpi_del_commit,
+ HP_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_hp_init();
return 0;
}
--
1.7.11.7
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-12-12 23:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 23:17 [RFC PATCH 00/11] Hot-plug and Online/Offline framework Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 01/11] Add hotplug.h for hotplug framework Toshi Kani
2012-12-12 23:53 ` Greg KH
2012-12-13 3:56 ` Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 02/11] drivers/base: Add hotplug framework code Toshi Kani
2012-12-12 23:54 ` Greg KH
2012-12-13 4:02 ` Toshi Kani
2012-12-13 4:24 ` Greg KH
2012-12-13 16:30 ` Toshi Kani
2012-12-13 18:24 ` Greg KH
2012-12-14 1:59 ` Toshi Kani
2012-12-12 23:55 ` Greg KH
2012-12-13 3:58 ` Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 03/11] cpu: Add cpu hotplug handlers Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 04/11] mm: Add memory " Toshi Kani
2012-12-12 23:17 ` Toshi Kani [this message]
2012-12-12 23:17 ` [RFC PATCH 06/11] ACPI: Add ACPI resource hotplug handler Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 07/11] ACPI: Update processor driver for hotplug framework Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 08/11] ACPI: Update memory " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 09/11] ACPI: Update container " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 10/11] cpu: Update sysfs cpu/online " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 11/11] ACPI: Update sysfs eject " Toshi Kani
2012-12-12 23:56 ` [RFC PATCH 00/11] Hot-plug and Online/Offline framework Greg KH
2012-12-13 0:39 ` Toshi Kani
2012-12-13 0:55 ` Greg KH
2012-12-13 3:37 ` Toshi Kani
2012-12-13 4:16 ` Greg KH
2012-12-13 16:03 ` Toshi Kani
2012-12-13 18:30 ` Greg KH
2012-12-14 1:51 ` 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=1355354243-18657-6-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=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).