diff options
author | Jesse Larrew <jlarrew@linux.vnet.ibm.com> | 2010-12-01 07:31:26 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-08 23:36:30 -0500 |
commit | 3b7a27db3b6b5501e3d1c1628e6d5a547ffe76c6 (patch) | |
tree | e30f3b6449ede133a03a56d8e57a82751ce3dbdc /arch/powerpc/kernel/rtas.c | |
parent | 9eff1a38407c051273fe1a20f03f8155bd32de35 (diff) |
powerpc: Disable VPHN polling during a suspend operation
Tie the polling mechanism into the ibm,suspend-me rtas call to
stop/restart polling before/after a suspend, hibernate, migrate,
or checkpoint restart operation. This ensures that the system has a
chance to disable the polling if the partition is migrated to a system
that does not support VPHN (and vice versa).
Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 8fe8bc61c10a..2097f2b3cba8 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <asm/atomic.h> | 41 | #include <asm/atomic.h> |
42 | #include <asm/time.h> | 42 | #include <asm/time.h> |
43 | #include <asm/mmu.h> | 43 | #include <asm/mmu.h> |
44 | #include <asm/topology.h> | ||
44 | 45 | ||
45 | struct rtas_t rtas = { | 46 | struct rtas_t rtas = { |
46 | .lock = __ARCH_SPIN_LOCK_UNLOCKED | 47 | .lock = __ARCH_SPIN_LOCK_UNLOCKED |
@@ -713,6 +714,7 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w | |||
713 | int cpu; | 714 | int cpu; |
714 | 715 | ||
715 | slb_set_size(SLB_MIN_SIZE); | 716 | slb_set_size(SLB_MIN_SIZE); |
717 | stop_topology_update(); | ||
716 | printk(KERN_DEBUG "calling ibm,suspend-me on cpu %i\n", smp_processor_id()); | 718 | printk(KERN_DEBUG "calling ibm,suspend-me on cpu %i\n", smp_processor_id()); |
717 | 719 | ||
718 | while (rc == H_MULTI_THREADS_ACTIVE && !atomic_read(&data->done) && | 720 | while (rc == H_MULTI_THREADS_ACTIVE && !atomic_read(&data->done) && |
@@ -728,6 +730,7 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w | |||
728 | rc = atomic_read(&data->error); | 730 | rc = atomic_read(&data->error); |
729 | 731 | ||
730 | atomic_set(&data->error, rc); | 732 | atomic_set(&data->error, rc); |
733 | start_topology_update(); | ||
731 | 734 | ||
732 | if (wake_when_done) { | 735 | if (wake_when_done) { |
733 | atomic_set(&data->done, 1); | 736 | atomic_set(&data->done, 1); |