|
@@ -875,15 +875,15 @@ static u64 __raw_read_system_reg(u32 sys_id)
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
- * Park the CPU which doesn't have the capability as advertised
|
|
|
|
- * by the system.
|
|
|
|
|
|
+ * Kill the calling secondary CPU, early in bringup before it is turned
|
|
|
|
+ * online.
|
|
*/
|
|
*/
|
|
-static void fail_incapable_cpu(char *cap_type,
|
|
|
|
- const struct arm64_cpu_capabilities *cap)
|
|
|
|
|
|
+void cpu_die_early(void)
|
|
{
|
|
{
|
|
int cpu = smp_processor_id();
|
|
int cpu = smp_processor_id();
|
|
|
|
|
|
- pr_crit("CPU%d: missing %s : %s\n", cpu, cap_type, cap->desc);
|
|
|
|
|
|
+ pr_crit("CPU%d: will not boot\n", cpu);
|
|
|
|
+
|
|
/* Mark this CPU absent */
|
|
/* Mark this CPU absent */
|
|
set_cpu_present(cpu, 0);
|
|
set_cpu_present(cpu, 0);
|
|
|
|
|
|
@@ -921,8 +921,11 @@ void verify_local_cpu_capabilities(void)
|
|
* If the new CPU misses an advertised feature, we cannot proceed
|
|
* If the new CPU misses an advertised feature, we cannot proceed
|
|
* further, park the cpu.
|
|
* further, park the cpu.
|
|
*/
|
|
*/
|
|
- if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))
|
|
|
|
- fail_incapable_cpu("arm64_features", &caps[i]);
|
|
|
|
|
|
+ if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i])) {
|
|
|
|
+ pr_crit("CPU%d: missing feature: %s\n",
|
|
|
|
+ smp_processor_id(), caps[i].desc);
|
|
|
|
+ cpu_die_early();
|
|
|
|
+ }
|
|
if (caps[i].enable)
|
|
if (caps[i].enable)
|
|
caps[i].enable(NULL);
|
|
caps[i].enable(NULL);
|
|
}
|
|
}
|
|
@@ -930,8 +933,11 @@ void verify_local_cpu_capabilities(void)
|
|
for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {
|
|
for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {
|
|
if (!cpus_have_hwcap(&caps[i]))
|
|
if (!cpus_have_hwcap(&caps[i]))
|
|
continue;
|
|
continue;
|
|
- if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))
|
|
|
|
- fail_incapable_cpu("arm64_hwcaps", &caps[i]);
|
|
|
|
|
|
+ if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i])) {
|
|
|
|
+ pr_crit("CPU%d: missing HWCAP: %s\n",
|
|
|
|
+ smp_processor_id(), caps[i].desc);
|
|
|
|
+ cpu_die_early();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|