|
@@ -75,6 +75,43 @@ enum ipi_msg_type {
|
|
IPI_WAKEUP
|
|
IPI_WAKEUP
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+#ifdef CONFIG_ARM64_VHE
|
|
|
|
+
|
|
|
|
+/* Whether the boot CPU is running in HYP mode or not*/
|
|
|
|
+static bool boot_cpu_hyp_mode;
|
|
|
|
+
|
|
|
|
+static inline void save_boot_cpu_run_el(void)
|
|
|
|
+{
|
|
|
|
+ boot_cpu_hyp_mode = is_kernel_in_hyp_mode();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static inline bool is_boot_cpu_in_hyp_mode(void)
|
|
|
|
+{
|
|
|
|
+ return boot_cpu_hyp_mode;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Verify that a secondary CPU is running the kernel at the same
|
|
|
|
+ * EL as that of the boot CPU.
|
|
|
|
+ */
|
|
|
|
+void verify_cpu_run_el(void)
|
|
|
|
+{
|
|
|
|
+ bool in_el2 = is_kernel_in_hyp_mode();
|
|
|
|
+ bool boot_cpu_el2 = is_boot_cpu_in_hyp_mode();
|
|
|
|
+
|
|
|
|
+ if (in_el2 ^ boot_cpu_el2) {
|
|
|
|
+ pr_crit("CPU%d: mismatched Exception Level(EL%d) with boot CPU(EL%d)\n",
|
|
|
|
+ smp_processor_id(),
|
|
|
|
+ in_el2 ? 2 : 1,
|
|
|
|
+ boot_cpu_el2 ? 2 : 1);
|
|
|
|
+ cpu_panic_kernel();
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#else
|
|
|
|
+static inline void save_boot_cpu_run_el(void) {}
|
|
|
|
+#endif
|
|
|
|
+
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
static int op_cpu_kill(unsigned int cpu);
|
|
static int op_cpu_kill(unsigned int cpu);
|
|
#else
|
|
#else
|
|
@@ -401,6 +438,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
|
|
void __init smp_prepare_boot_cpu(void)
|
|
void __init smp_prepare_boot_cpu(void)
|
|
{
|
|
{
|
|
cpuinfo_store_boot_cpu();
|
|
cpuinfo_store_boot_cpu();
|
|
|
|
+ save_boot_cpu_run_el();
|
|
set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
|
|
set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
|
|
}
|
|
}
|
|
|
|
|