diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-08-12 19:49:40 -0700 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-08-30 00:57:27 +0200 |
| commit | d595d423d06071bd7a4892c3c2f16bfe1d5b3a85 (patch) | |
| tree | babe4bf15082b7528e8c316dc0ec8630b0e24df9 /arch/mips/cavium-octeon | |
| parent | 68923cdc2eb34124d77bc27f7945d7ff16b236dd (diff) | |
| download | linux-d595d423d06071bd7a4892c3c2f16bfe1d5b3a85.tar.gz linux-d595d423d06071bd7a4892c3c2f16bfe1d5b3a85.tar.bz2 linux-d595d423d06071bd7a4892c3c2f16bfe1d5b3a85.zip | |
MIPS: SMP: Allow boot_secondary SMP op to return errors
Allow the boot_secondary SMP op to return an error to __cpu_up(), which
will in turn return it to its caller.
This will allow SMP implementations to return errors quickly in cases
they they know have failed, rather than relying upon __cpu_up()
eventually timing out waiting for the cpu_running completion.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17014/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon')
| -rw-r--r-- | arch/mips/cavium-octeon/smp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 163663a5363d..75e7c8625659 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -205,7 +205,7 @@ int plat_post_relocation(long offset) * Firmware CPU startup hook * */ -static void octeon_boot_secondary(int cpu, struct task_struct *idle) +static int octeon_boot_secondary(int cpu, struct task_struct *idle) { int count; @@ -223,8 +223,12 @@ static void octeon_boot_secondary(int cpu, struct task_struct *idle) udelay(1); count--; } - if (count == 0) + if (count == 0) { pr_err("Secondary boot timeout\n"); + return -ETIMEDOUT; + } + + return 0; } /** |