1 files changed, 86 insertions, 107 deletions

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 24c807f96636..eb30e5ab4cab 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -31,6 +31,7 @@
 #include <linux/types.h>
 #include <linux/memory_hotplug.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
 #include <acpi/acpi_drivers.h>
 
 #define ACPI_MEMORY_DEVICE_CLASS                "memory"
@@ -78,6 +79,7 @@ struct acpi_memory_info {
         unsigned short caching; /* memory cache attribute */
         unsigned short write_protect;   /* memory read/write attribute */
         unsigned int enabled:1;
+        unsigned int failed:1;
 };
 
 struct acpi_memory_device {
@@ -86,8 +88,6 @@ struct acpi_memory_device {
         struct list_head res_list;
 };
 
-static int acpi_hotmem_initialized;
-
 static acpi_status
 acpi_memory_get_resource(struct acpi_resource *resource, void *context)
 {
@@ -125,12 +125,20 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)
         return AE_OK;
 }
 
+static void
+acpi_memory_free_device_resources(struct acpi_memory_device *mem_device)
+{
+        struct acpi_memory_info *info, *n;
+
+        list_for_each_entry_safe(info, n, &mem_device->res_list, list)
+                kfree(info);
+        INIT_LIST_HEAD(&mem_device->res_list);
+}
+
 static int
 acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
 {
         acpi_status status;
-        struct acpi_memory_info *info, *n;
-
 
         if (!list_empty(&mem_device->res_list))
                 return 0;
@@ -138,9 +146,7 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
         status = acpi_walk_resources(mem_device->device->handle, METHOD_NAME__CRS,
                                      acpi_memory_get_resource, mem_device);
         if (ACPI_FAILURE(status)) {
-                list_for_each_entry_safe(info, n, &mem_device->res_list, list)
-                        kfree(info);
-                INIT_LIST_HEAD(&mem_device->res_list);
+                acpi_memory_free_device_resources(mem_device);
                 return -EINVAL;
         }
 
@@ -170,7 +176,7 @@ acpi_memory_get_device(acpi_handle handle,
         /* Get the parent device */
         result = acpi_bus_get_device(phandle, &pdevice);
         if (result) {
-                printk(KERN_WARNING PREFIX "Cannot get acpi bus device");
+                acpi_handle_warn(phandle, "Cannot get acpi bus device\n");
                 return -EINVAL;
         }
 
@@ -180,14 +186,14 @@ acpi_memory_get_device(acpi_handle handle,
          */
         result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
         if (result) {
-                printk(KERN_WARNING PREFIX "Cannot add acpi bus");
+                acpi_handle_warn(handle, "Cannot add acpi bus\n");
                 return -EINVAL;
         }
 
       end:
         *mem_device = acpi_driver_data(device);
         if (!(*mem_device)) {
-                printk(KERN_ERR "\n driver data not found");
+                dev_err(&device->dev, "driver data not found\n");
                 return -ENODEV;
         }
 
@@ -224,7 +230,8 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
         /* Get the range from the _CRS */
         result = acpi_memory_get_device_resources(mem_device);
         if (result) {
-                printk(KERN_ERR PREFIX "get_device_resources failed\n");
+                dev_err(&mem_device->device->dev,
+                        "get_device_resources failed\n");
                 mem_device->state = MEMORY_INVALID_STATE;
                 return result;
         }
@@ -251,13 +258,27 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
                         node = memory_add_physaddr_to_nid(info->start_addr);
 
                 result = add_memory(node, info->start_addr, info->length);
-                if (result)
+
+                /*
+                 * If the memory block has been used by the kernel, add_memory()
+                 * returns -EEXIST. If add_memory() returns the other error, it
+                 * means that this memory block is not used by the kernel.
+                 */
+                if (result && result != -EEXIST) {
+                        info->failed = 1;
                         continue;
-                info->enabled = 1;
+                }
+
+                if (!result)
+                        info->enabled = 1;
+                /*
+                 * Add num_enable even if add_memory() returns -EEXIST, so the
+                 * device is bound to this driver.
+                 */
                 num_enabled++;
         }
         if (!num_enabled) {
-                printk(KERN_ERR PREFIX "add_memory failed\n");
+                dev_err(&mem_device->device->dev, "add_memory failed\n");
                 mem_device->state = MEMORY_INVALID_STATE;
                 return -EINVAL;
         }
@@ -272,68 +293,31 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
         return 0;
 }
 
-static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)
+static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
 {
-        acpi_status status;
-        struct acpi_object_list arg_list;
-        union acpi_object arg;
-        unsigned long long current_status;
-
-
-        /* Issue the _EJ0 command */
-        arg_list.count = 1;
-        arg_list.pointer = &arg;
-        arg.type = ACPI_TYPE_INTEGER;
-        arg.integer.value = 1;
-        status = acpi_evaluate_object(mem_device->device->handle,
-                                      "_EJ0", &arg_list, NULL);
-        /* Return on _EJ0 failure */
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "_EJ0 failed"));
-                return -ENODEV;
-        }
-
-        /* Evalute _STA to check if the device is disabled */
-        status = acpi_evaluate_integer(mem_device->device->handle, "_STA",
-                                       NULL, &current_status);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        /* Check for device status.  Device should be disabled */
-        if (current_status & ACPI_STA_DEVICE_ENABLED)
-                return -EINVAL;
+        int result = 0;
+        struct acpi_memory_info *info, *n;
 
-        return 0;
-}
+        list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
+                if (info->failed)
+                        /* The kernel does not use this memory block */
+                        continue;
 
-static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
-{
-        int result;
-        struct acpi_memory_info *info, *n;
+                if (!info->enabled)
+                        /*
+                         * The kernel uses this memory block, but it may be not
+                         * managed by us.
+                         */
+                        return -EBUSY;
 
+                result = remove_memory(info->start_addr, info->length);
+                if (result)
+                        return result;
 
-        /*
-         * Ask the VM to offline this memory range.
-         * Note: Assume that this function returns zero on success
-         */
-        list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
-                if (info->enabled) {
-                        result = remove_memory(info->start_addr, info->length);
-                        if (result)
-                                return result;
-                }
+                list_del(&info->list);
                 kfree(info);
         }
 
-        /* Power-off and eject the device */
-        result = acpi_memory_powerdown_device(mem_device);
-        if (result) {
-                /* Set the status of the device to invalid */
-                mem_device->state = MEMORY_INVALID_STATE;
-                return result;
-        }
-
-        mem_device->state = MEMORY_POWER_OFF_STATE;
         return result;
 }
 
@@ -341,6 +325,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 {
         struct acpi_memory_device *mem_device;
         struct acpi_device *device;
+        struct acpi_eject_event *ej_event = NULL;
         u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
 
         switch (event) {
@@ -353,7 +338,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                           "\nReceived DEVICE CHECK notification for device\n"));
                 if (acpi_memory_get_device(handle, &mem_device)) {
-                        printk(KERN_ERR PREFIX "Cannot find driver data\n");
+                        acpi_handle_err(handle, "Cannot find driver data\n");
                         break;
                 }
 
@@ -361,7 +346,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                         break;
 
                 if (acpi_memory_enable_device(mem_device)) {
-                        printk(KERN_ERR PREFIX "Cannot enable memory device\n");
+                        acpi_handle_err(handle,"Cannot enable memory device\n");
                         break;
                 }
 
@@ -373,40 +358,28 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                                   "\nReceived EJECT REQUEST notification for device\n"));
 
                 if (acpi_bus_get_device(handle, &device)) {
-                        printk(KERN_ERR PREFIX "Device doesn't exist\n");
+                        acpi_handle_err(handle, "Device doesn't exist\n");
                         break;
                 }
                 mem_device = acpi_driver_data(device);
                 if (!mem_device) {
-                        printk(KERN_ERR PREFIX "Driver Data is NULL\n");
+                        acpi_handle_err(handle, "Driver Data is NULL\n");
                         break;
                 }
 
-                /*
-                 * Currently disabling memory device from kernel mode
-                 * TBD: Can also be disabled from user mode scripts
-                 * TBD: Can also be disabled by Callback registration
-                 *      with generic sysfs driver
-                 */
-                if (acpi_memory_disable_device(mem_device)) {
-                        printk(KERN_ERR PREFIX "Disable memory device\n");
-                        /*
-                         * If _EJ0 was called but failed, _OST is not
-                         * necessary.
-                         */
-                        if (mem_device->state == MEMORY_INVALID_STATE)
-                                return;
-
+                ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
+                if (!ej_event) {
+                        pr_err(PREFIX "No memory, dropping EJECT\n");
                         break;
                 }
 
-                /*
-                 * TBD: Invoke acpi_bus_remove to cleanup data structures
-                 */
+                ej_event->handle = handle;
+                ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
+                acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
+                                        (void *)ej_event);
 
-                /* _EJ0 succeeded; _OST is not necessary */
+                /* eject is performed asynchronously */
                 return;
-
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
@@ -420,6 +393,15 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
         return;
 }
 
+static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
+{
+        if (!mem_device)
+                return;
+
+        acpi_memory_free_device_resources(mem_device);
+        kfree(mem_device);
+}
+
 static int acpi_memory_device_add(struct acpi_device *device)
 {
         int result;
@@ -449,23 +431,16 @@ static int acpi_memory_device_add(struct acpi_device *device)
         /* Set the device state */
         mem_device->state = MEMORY_POWER_ON_STATE;
 
-        printk(KERN_DEBUG "%s \n", acpi_device_name(device));
-
-        /*
-         * Early boot code has recognized memory area by EFI/E820.
-         * If DSDT shows these memory devices on boot, hotplug is not necessary
-         * for them. So, it just returns until completion of this driver's
-         * start up.
-         */
-        if (!acpi_hotmem_initialized)
-                return 0;
+        pr_debug("%s\n", acpi_device_name(device));
 
         if (!acpi_memory_check_device(mem_device)) {
                 /* call add_memory func */
                 result = acpi_memory_enable_device(mem_device);
-                if (result)
-                        printk(KERN_ERR PREFIX
+                if (result) {
+                        dev_err(&device->dev,
                                 "Error in acpi_memory_enable_device\n");
+                        acpi_memory_device_free(mem_device);
+                }
         }
         return result;
 }
@@ -473,13 +448,18 @@ static int acpi_memory_device_add(struct acpi_device *device)
 static int acpi_memory_device_remove(struct acpi_device *device, int type)
 {
         struct acpi_memory_device *mem_device = NULL;
-
+        int result;
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
         mem_device = acpi_driver_data(device);
-        kfree(mem_device);
+
+        result = acpi_memory_remove_memory(mem_device);
+        if (result)
+                return result;
+
+        acpi_memory_device_free(mem_device);
 
         return 0;
 }
@@ -568,7 +548,6 @@ static int __init acpi_memory_device_init(void)
                 return -ENODEV;
         }
 
-        acpi_hotmem_initialized = 1;
         return 0;
 }