diff options
| author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2016-02-23 10:31:39 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-02-24 17:17:44 +0000 |
| commit | c4bc34d20273db698c51951a1951dba0a722e162 (patch) | |
| tree | 2c453a2ceef319fab387415016f9c7cb6039f979 /arch/arm64 | |
| parent | 2b5fe07a78a09a32002642b8a823428ade611f16 (diff) | |
| download | op-kernel-dev-c4bc34d20273db698c51951a1951dba0a722e162.zip op-kernel-dev-c4bc34d20273db698c51951a1951dba0a722e162.tar.gz | |
arm64: Add a helper for parking CPUs in a loop
Adds a routine which can be used to park CPUs (spinning in kernel)
when they can't be killed.
Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/smp.h | 8 | ||||
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index 2013a4d..b93eb33 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -78,4 +78,12 @@ extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); extern void cpu_die(void); +static inline void cpu_park_loop(void) +{ + for (;;) { + wfe(); + wfi(); + } +} + #endif /* ifndef __ASM_SMP_H */ diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 7566cad..99f0c5c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -890,10 +890,7 @@ static void fail_incapable_cpu(char *cap_type, /* Check if we can park ourselves */ if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die) cpu_ops[cpu]->cpu_die(cpu); - asm( - "1: wfe\n" - " wfi\n" - " b 1b"); + cpu_park_loop(); } /* |
