summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/kexec.h
diff options
context:
space:
mode:
authorDengcheng Zhu2018-09-11 23:49:21 +0200
committerPaul Burton2018-09-22 19:31:50 +0200
commit62cac480f33f8f9413d609cb1601b0ee521a86b8 (patch)
tree92d3e1e0e580cbc175cd27b77b0ddf7c931ac338 /arch/mips/include/asm/kexec.h
parentMIPS: kexec: Mark CPU offline before disabling local IRQ (diff)
downloadkernel-qcow2-linux-62cac480f33f8f9413d609cb1601b0ee521a86b8.tar.gz
kernel-qcow2-linux-62cac480f33f8f9413d609cb1601b0ee521a86b8.tar.xz
kernel-qcow2-linux-62cac480f33f8f9413d609cb1601b0ee521a86b8.zip
MIPS: kexec: Make a framework for both jumping and halting on nonboot CPUs
The existing implementation lets machine_kexec() CPU jump to reboot code buffer, whereas other CPUs to relocated_kexec_smp_wait. The natural way to bring up an SMP new kernel would be to let CPU0 do it while others being halted. For those failing to do so, fall back to the jumping method. Signed-off-by: Dengcheng Zhu <dzhu@wavecomp.com> [paul.burton@mips.com: Guard kexec_nonboot_cpu_jump with CONFIG_SMP] Signed-off-by: Paul Burton <paul.burton@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/20570/ Cc: pburton@wavecomp.com Cc: ralf@linux-mips.org Cc: linux-mips@linux-mips.org Cc: rachel.mozes@intel.com
Diffstat (limited to 'arch/mips/include/asm/kexec.h')
-rw-r--r--arch/mips/include/asm/kexec.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/include/asm/kexec.h b/arch/mips/include/asm/kexec.h
index 493a3cc7c39a..5eeb648c4e3a 100644
--- a/arch/mips/include/asm/kexec.h
+++ b/arch/mips/include/asm/kexec.h
@@ -39,11 +39,12 @@ extern unsigned long kexec_args[4];
extern int (*_machine_kexec_prepare)(struct kimage *);
extern void (*_machine_kexec_shutdown)(void);
extern void (*_machine_crash_shutdown)(struct pt_regs *regs);
-extern void default_machine_crash_shutdown(struct pt_regs *regs);
+void default_machine_crash_shutdown(struct pt_regs *regs);
+void kexec_nonboot_cpu_jump(void);
+void kexec_reboot(void);
#ifdef CONFIG_SMP
extern const unsigned char kexec_smp_wait[];
extern unsigned long secondary_kexec_args[4];
-extern void (*relocated_kexec_smp_wait) (void *);
extern atomic_t kexec_ready_to_reboot;
extern void (*_crash_smp_send_stop)(void);
#endif