[4/8] introduce device async suspend

Commit Message

Zhang, Rui July 15, 2009, 7:38 a.m. UTC

introduce device async suspend.

If boot option "device_async_action" is added,
devices can be suspended asynchronously.

Signed-off-by: Zhang Rui <[e-mail]>
---
 drivers/base/power/main.c |    6 +++++-
 include/linux/async_dev.h |    3 ++-
 drivers/base/async_dev.c        |   13 ++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/base/power/main.c
===================================================================
--- linux-2.6.orig/drivers/base/power/main.c
+++ linux-2.6/drivers/base/power/main.c
@@ -24,6 +24,7 @@ 
 #include <linux/resume-trace.h>
 #include <linux/rwsem.h>
 #include <linux/interrupt.h>
+#include <linux/async_dev.h>
 
 #include "../base.h"
 #include "power.h"
@@ -678,7 +679,8 @@  static int dpm_suspend(pm_message_t stat
 		get_device(dev);
 		mutex_unlock(&dpm_list_mtx);
 
-		error = device_suspend(dev, state);
+		error = dev_async_schedule(dev, device_suspend, &state,
+						DEV_ASYNC_SUSPEND);
 
 		mutex_lock(&dpm_list_mtx);
 		if (error) {
@@ -693,6 +695,8 @@  static int dpm_suspend(pm_message_t stat
 	}
 	list_splice(&list, dpm_list.prev);
 	mutex_unlock(&dpm_list_mtx);
+
+	dev_async_synchronization();
 	return error;
 }
 
Index: linux-2.6/drivers/base/async_dev.c
===================================================================
--- linux-2.6.orig/drivers/base/async_dev.c
+++ linux-2.6/drivers/base/async_dev.c
@@ -17,6 +17,8 @@ 
 static LIST_HEAD(dev_async_list);
 static int dev_async_enabled;
 
+typedef int (*dev_async_suspend)(struct device *, pm_message_t);
+
 struct dev_async_context {
 	struct device *dev;
 	void *data;
@@ -27,10 +29,19 @@  struct dev_async_context {
 static int dev_action(struct device *dev, void *func,
 			void *data, int type)
 {
+	int error = 0;
+
 	if (!func)
 		return -EINVAL;
 
-	return 0;
+	switch (type) {
+	case DEV_ASYNC_SUSPEND:
+		error = ((dev_async_suspend)func)(dev, *((pm_message_t *)data));
+		break;
+	default:
+		return -EINVAL;
+	}
+	return error;
 }
 
 static void dev_async_action(void *data, async_cookie_t cookie)
Index: linux-2.6/include/linux/async_dev.h
===================================================================
--- linux-2.6.orig/include/linux/async_dev.h
+++ linux-2.6/include/linux/async_dev.h
@@ -28,7 +28,8 @@  struct dev_async_struct {
 	async_cookie_t cookie;
 };
 
-#define DEV_ASYNC_ACTIONS_ALL	0
+#define DEV_ASYNC_SUSPEND	1
+#define DEV_ASYNC_ACTIONS_ALL	DEV_ASYNC_SUSPEND
 
 extern int dev_async_schedule(struct device *, void *,
 			void *, int);