arm64: kexec: always reset to EL2 if present

Currently machine_kexec() doesn't reset to EL2 in the case of a
crashdump kernel. This leaves potentially dodgy state active at EL2, and
means that if the crashdump kernel attempts to online secondary CPUs,
these will be booted as mismatched ELs.

Let's reset to EL2, as we do in all other cases, and simplify things. If
EL2 state is corrupt, things are already sufficiently bad that kdump is
unlikely to work, and it's best-effort regardless.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h
index 6c2b1b4..fad90e4 100644 (file)
--- a/arch/arm64/kernel/cpu-reset.h
+++ b/arch/arm64/kernel/cpu-reset.h
@@ -16,13 +16,14 @@
 void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
        unsigned long arg0, unsigned long arg1, unsigned long arg2);
 
-static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,
-       unsigned long entry, unsigned long arg0, unsigned long arg1,
-       unsigned long arg2)
+static inline void __noreturn cpu_soft_restart(unsigned long entry,
+                                              unsigned long arg0,
+                                              unsigned long arg1,
+                                              unsigned long arg2)
 {
        typeof(__cpu_soft_restart) *restart;
 
-       el2_switch = el2_switch && !is_kernel_in_hyp_mode() &&
+       unsigned long el2_switch = !is_kernel_in_hyp_mode() &&
                is_hyp_mode_available();
        restart = (void *)__pa_symbol(__cpu_soft_restart);
 

diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index f76ea92..f62effc 100644 (file)
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -207,8 +207,7 @@ void machine_kexec(struct kimage *kimage)
         * relocation is complete.
         */
 
-       cpu_soft_restart(kimage != kexec_crash_image,
-               reboot_code_buffer_phys, kimage->head, kimage->start, 0);
+       cpu_soft_restart(reboot_code_buffer_phys, kimage->head, kimage->start, 0);
 
        BUG(); /* Should never get here. */
 }