Changed container_notify_cb() to request a hotplug operation by
calling shp_submit_req(). It no longer initiates hot-add by calling
acpi_bus_add(). Also, it no longer sets device->flags.eject_pending
and generates KOBJ_OFFLINE event for hot-delete.
Signed-off-by: Toshi Kani <toshi.k...@hp.com>
---
drivers/acpi/container.c | 95 ++++++++++++++++++----------------------------
1 file changed, 37 insertions(+), 58 deletions(-)
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 811910b..89af4fc 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -35,6 +35,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/container.h>
+#include <acpi/sys_hotplug.h>
#define PREFIX "ACPI: "
@@ -135,77 +136,37 @@ static int acpi_container_remove(struct acpi_device
*device, int type)
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)
+static void container_notify_cb(acpi_handle handle, u32 event, void *context)
{
struct acpi_device *device = NULL;
- int result;
- int present;
- acpi_status status;
+ struct shp_request *shp_req;
+ enum shp_operation shp_op;
u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
- switch (type) {
+ switch (event) {
case ACPI_NOTIFY_BUS_CHECK:
/* Fall through */
case ACPI_NOTIFY_DEVICE_CHECK:
- pr_debug("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 (!is_device_present(handle)) {
+ acpi_handle_err(handle, "Device not enabled\n");
+ goto err;
}
- if (!ACPI_FAILURE(status) || device)
- break;
-
- result = container_device_add(&device, handle);
- if (result) {
- acpi_handle_warn(handle, "Failed to add container\n");
- break;
+ if (!acpi_bus_get_device(handle, &device)) {
+ acpi_handle_err(handle, "Device added already\n");
+ goto err;
}
- kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
- ost_code = ACPI_OST_SC_SUCCESS;
+ shp_op = SHP_HOTPLUG_ADD;
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;
+ if (acpi_bus_get_device(handle, &device)) {
+ acpi_handle_err(handle, "Device not added yet\n");
+ goto err;
}
+
+ shp_op = SHP_HOTPLUG_DEL;
break;
default:
@@ -213,8 +174,26 @@ static void container_notify_cb(acpi_handle handle, u32
type, void *context)
return;
}
- /* Inform firmware that the hotplug operation has completed */
- (void) acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
+ shp_req = shp_alloc_request(shp_op);
+ if (!shp_req) {
+ acpi_handle_err(handle, "No memory to request hotplug\n");
+ goto err;
+ }
+
+ shp_req->handle = (void *)handle;
+ shp_req->event = event;
+
+ if (shp_submit_req(shp_req)) {
+ acpi_handle_err(handle, "Failed to request hotplug\n");
+ kfree(shp_req);
+ goto err;
+ }
+
+ return;
+
+err:
+ /* Inform firmware that the hotplug operation completed w/ error */
+ (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
return;
}
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
