1 files changed, 10 insertions, 26 deletions

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index cdf1dca64133..53fab76d3c39 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -895,28 +895,6 @@ static u64 __raw_read_system_reg(u32 sys_id)
 }
 
 /*
- * Park the CPU which doesn't have the capability as advertised
- * by the system.
- */
-static void fail_incapable_cpu(char *cap_type,
-                                 const struct arm64_cpu_capabilities *cap)
-{
-        int cpu = smp_processor_id();
-
-        pr_crit("CPU%d: missing %s : %s\n", cpu, cap_type, cap->desc);
-        /* Mark this CPU absent */
-        set_cpu_present(cpu, 0);
-
-        /* Check if we can park ourselves */
-        if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die)
-                cpu_ops[cpu]->cpu_die(cpu);
-        asm(
-        "1:     wfe\n"
-        "       wfi\n"
-        "       b       1b");
-}
-
-/*
  * Run through the enabled system capabilities and enable() it on this CPU.
  * The capabilities were decided based on the available CPUs at the boot time.
  * Any new CPU should match the system wide status of the capability. If the
@@ -944,8 +922,11 @@ void verify_local_cpu_capabilities(void)
                  * If the new CPU misses an advertised feature, we cannot proceed
                  * 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)
                         caps[i].enable(NULL);
         }
@@ -953,8 +934,11 @@ void verify_local_cpu_capabilities(void)
         for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {
                 if (!cpus_have_hwcap(&caps[i]))
                         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();
+                }
         }
 }