diff options
author | Isaku Yamahata <yamahata@valinux.co.jp> | 2008-07-08 18:06:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 04:55:50 -0400 |
commit | ad55db9fed6d6cd09333045945cb03ba2c070085 (patch) | |
tree | a0f6acbb1c7d139b248b3a9f2d45d087b802936b /drivers/xen/manage.c | |
parent | 1ffb40b8ecdf314edd88dc5550d6bcbebf29970b (diff) |
xen: add xen_arch_resume()/xen_timer_resume hook for ia64 support
add xen_timer_resume() hook.
Timer resume should be done after event channel is resumed.
add xen_arch_resume() hook when ipi becomes usable after resume.
After resume, some cpu specific resource must be reinitialized
on ia64 that can't be set by another cpu.
However available hooks is run once on only one cpu so that ipi has
to be used.
During stop_machine_run() ipi can't be used because interrupt is masked.
So add another hook after stop_machine_run().
Another approach might be use resume hook which is run by
device_resume(). However device_resume() may be executed on
suspend error recovery path.
So it is necessary to determine whether it is executed on real resume path
or error recovery path.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/xen/manage.c')
-rw-r--r-- | drivers/xen/manage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 5b546e365f00..2bb268e4ac56 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
@@ -68,6 +68,7 @@ static int xen_suspend(void *data) | |||
68 | if (!*cancelled) { | 68 | if (!*cancelled) { |
69 | xen_irq_resume(); | 69 | xen_irq_resume(); |
70 | xen_console_resume(); | 70 | xen_console_resume(); |
71 | xen_timer_resume(); | ||
71 | } | 72 | } |
72 | 73 | ||
73 | return 0; | 74 | return 0; |
@@ -107,9 +108,10 @@ static void do_suspend(void) | |||
107 | goto out; | 108 | goto out; |
108 | } | 109 | } |
109 | 110 | ||
110 | if (!cancelled) | 111 | if (!cancelled) { |
112 | xen_arch_resume(); | ||
111 | xenbus_resume(); | 113 | xenbus_resume(); |
112 | else | 114 | } else |
113 | xenbus_suspend_cancel(); | 115 | xenbus_suspend_cancel(); |
114 | 116 | ||
115 | device_resume(); | 117 | device_resume(); |