public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: smp: consistently use error codes

Browse source 
cpu_kill currently returns one for success and zero for failure, which
is unlike all the other cpu_operations, which return zero for success
and an error code upon failure. This difference is unnecessarily
confusing.

Make cpu_kill consistent with the other cpu_operations.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Mark Rutland 2015-04-20 17:55:30 +01:00
parent 6ee3c78cec
commit 6b99c68cb5
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm64/kernel/psci.c
View file

@ -501,7 +501,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
int err, i; int err, i;
if (!psci_ops.affinity_info) if (!psci_ops.affinity_info)
return 1; return 0;
/* /*
* cpu_kill could race with cpu_die and we can * cpu_kill could race with cpu_die and we can
* potentially end up declaring this cpu undead * potentially end up declaring this cpu undead
@ -512,7 +512,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
err = psci_ops.affinity_info(cpu_logical_map(cpu), 0); err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);
if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) { if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {
pr_info("CPU%d killed.\n", cpu); pr_info("CPU%d killed.\n", cpu);
return 1; return 0;
} }
msleep(10); msleep(10);
@ -521,8 +521,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n", pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",
cpu, err); cpu, err);
/* Make op_cpu_kill() fail. */ return -ETIMEDOUT;
return 0;
} }
#endif #endif
#endif #endif

10
arch/arm64/kernel/smp.c
View file

@ -249,7 +249,7 @@ static int op_cpu_kill(unsigned int cpu)
* time and hope that it's dead, so let's skip the wait and just hope. * time and hope that it's dead, so let's skip the wait and just hope.
*/ */
if (!cpu_ops[cpu]->cpu_kill) if (!cpu_ops[cpu]->cpu_kill)
return 1; return 0;
return cpu_ops[cpu]->cpu_kill(cpu); return cpu_ops[cpu]->cpu_kill(cpu);
} }
@ -262,6 +262,8 @@ static DECLARE_COMPLETION(cpu_died);
*/ */
void __cpu_die(unsigned int cpu) void __cpu_die(unsigned int cpu)
{ {
int err;
if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
pr_crit("CPU%u: cpu didn't die\n", cpu); pr_crit("CPU%u: cpu didn't die\n", cpu);
return; return;
@ -274,8 +276,10 @@ void __cpu_die(unsigned int cpu)
* verify that it has really left the kernel before we consider * verify that it has really left the kernel before we consider
* clobbering anything it might still be using. * clobbering anything it might still be using.
*/ */
if (!op_cpu_kill(cpu)) err = op_cpu_kill(cpu);
pr_warn("CPU%d may not have shut down cleanly\n", cpu); if (err)
pr_warn("CPU%d may not have shut down cleanly: %d\n",
cpu, err);
} }
/* /*