Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b99c68c authored by Mark Rutland's avatar Mark Rutland
Browse files

arm64: smp: consistently use error codes 



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: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
parent 6ee3c78c

arch/arm64/kernel/psci.c

+3 −4
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) 
	int err, i;



	if (!psci_ops.affinity_info)

		return 1;

		return 0;

	/*

	 * cpu_kill could race with cpu_die and we can

	 * 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);

		if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {

			pr_info("CPU%d killed.\n", cpu);

			return 1;

			return 0;

		}



		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",

			cpu, err);

	/* Make op_cpu_kill() fail. */

	return 0;

	return -ETIMEDOUT;

}

#endif

#endif

arch/arm64/kernel/smp.c

+7 −3
Original line number Diff line number Diff line
@@ -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.

	 */

	if (!cpu_ops[cpu]->cpu_kill)

		return 1;

		return 0;



	return cpu_ops[cpu]->cpu_kill(cpu);

}
@@ -262,6 +262,8 @@ static DECLARE_COMPLETION(cpu_died); 
 */

void __cpu_die(unsigned int cpu)

{

	int err;



	if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {

		pr_crit("CPU%u: cpu didn't die\n", cpu);

		return;
@@ -274,8 +276,10 @@ void __cpu_die(unsigned int cpu) 
	 * verify that it has really left the kernel before we consider

	 * clobbering anything it might still be using.

	 */

	if (!op_cpu_kill(cpu))

		pr_warn("CPU%d may not have shut down cleanly\n", cpu);

	err = op_cpu_kill(cpu);

	if (err)

		pr_warn("CPU%d may not have shut down cleanly: %d\n",

			cpu, err);

}



/*