[4.9,020/125] arm64: smp: Handle errors reported by the firmware

Message ID 20191204175318.319074728@linuxfoundation.org
State New
Headers show
  • Untitled series #25420
Related show

Commit Message

Greg KH Dec. 4, 2019, 5:55 p.m.
From: Suzuki K Poulose <Suzuki.Poulose@arm.com>

[ Upstream commit f357b3a7e17af7736d67d8267edc1ed3d1dd9391 ]

The __cpu_up() routine ignores the errors reported by the firmware
for a CPU bringup operation and looks for the error status set by the
booting CPU. If the CPU never entered the kernel, we could end up
in assuming stale error status, which otherwise would have been
set/cleared appropriately by the booting CPU.

Reported-by: Steve Capper <steve.capper@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>

Signed-off-by: Will Deacon <will.deacon@arm.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

 arch/arm64/kernel/smp.c | 1 +
 1 file changed, 1 insertion(+)



diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index f0c41524b052f..b2d6de9f6f4fb 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -173,6 +173,7 @@  int __cpu_up(unsigned int cpu, struct task_struct *idle)
 	} else {
 		pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
+		return ret;
 	secondary_data.stack = NULL;