diff options
| author | James Morse <james.morse@arm.com> | 2016-06-22 10:06:13 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-06-22 15:48:10 +0100 |
| commit | d74b4e4f1a6dbe27acce723e071c86a6ed154bf2 (patch) | |
| tree | 41ddeb5bc6ef1201129a009cc123e80e9a0d16b2 /arch/arm64 | |
| parent | 5c492c3f5255bd34f7ff8867515ecf98dcba2a2e (diff) | |
| download | op-kernel-dev-d74b4e4f1a6dbe27acce723e071c86a6ed154bf2.zip op-kernel-dev-d74b4e4f1a6dbe27acce723e071c86a6ed154bf2.tar.gz | |
arm64: hibernate: Don't hibernate on systems with stuck CPUs
Hibernate relies on cpu hotplug to prevent secondary cores executing
the kernel text while it is being restored.
Add a call to cpus_are_stuck_in_kernel() to determine if there are
CPUs not counted by 'num_online_cpus()', and prevent hibernate in this
case.
Fixes: 82869ac57b5 ("arm64: kernel: Add support for hibernate/suspend-to-disk")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/hibernate.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index f8df75d..21ab5df 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -33,6 +33,7 @@ #include <asm/pgtable.h> #include <asm/pgtable-hwdef.h> #include <asm/sections.h> +#include <asm/smp.h> #include <asm/suspend.h> #include <asm/virt.h> @@ -236,6 +237,11 @@ int swsusp_arch_suspend(void) unsigned long flags; struct sleep_stack_data state; + if (cpus_are_stuck_in_kernel()) { + pr_err("Can't hibernate: no mechanism to offline secondary CPUs.\n"); + return -EBUSY; + } + local_dbg_save(flags); if (__cpu_suspend_enter(&state)) { |
