Commit 58613cd1 authored Dec 18, 2010 by Russell King

ARM: smp: improve CPU bringup failure diagnostics



We used to print a bland error message which gave no clue as to the
failure when we failed to bring up a secondary CPU.  Resolve this by
separating the two failure cases.

If boot_secondary() fails, we print a message indicating the returned
error code from boot_secondary():
	"CPU%u: failed to boot: %d\n", cpu, ret.

However, if boot_secondary() succeeded, but the CPU did not appear to
mark itself online within the timeout, indicate that it failed to come
online:
	"CPU%u: failed to come online\n", cpu

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 90b44199

arch/arm/kernel/smp.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -164,9 +164,13 @@ int __cpuinit __cpu_up(unsigned int cpu)
		barrier();
		}

		if (!cpu_online(cpu))
		if (!cpu_online(cpu)) {
		pr_crit("CPU%u: failed to come online\n", cpu);
		ret = -EIO;
		}
		} else {
		pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
		}

		secondary_data.stack = NULL;
		secondary_data.pgdir = 0;
		@@ -181,14 +185,6 @@ int __cpuinit __cpu_up(unsigned int cpu)

		pgd_free(&init_mm, pgd);

		if (ret) {
		printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu);

		/*
		* FIXME: We need to clean up the new idle thread. --rmk
		*/
		}

		return ret;
		}

Admin message