From: Dengcheng Zhu <dzhu@wavecomp.com>
To: pburton@wavecomp.com, ralf@linux-mips.org
Cc: linux-mips@linux-mips.org, rachel.mozes@intel.com,
Dengcheng Zhu <dzhu@wavecomp.com>
Subject: [PATCH v4 3/6] MIPS: kexec: Deprecate (relocated_)kexec_smp_wait
Date: Wed, 5 Sep 2018 08:59:06 -0700 [thread overview]
Message-ID: <20180905155909.30454-4-dzhu@wavecomp.com> (raw)
In-Reply-To: <20180905155909.30454-1-dzhu@wavecomp.com>
Since we've changed the SMP boot mechanism (by having the new kernel handle
all CPUs), now remove (relocated_)kexec_smp_wait.
Tested-by: Rachel Mozes <rachel.mozes@intel.com>
Reported-by: Rachel Mozes <rachel.mozes@intel.com>
Signed-off-by: Dengcheng Zhu <dzhu@wavecomp.com>
---
arch/mips/include/asm/kexec.h | 2 --
arch/mips/kernel/machine_kexec.c | 5 ----
arch/mips/kernel/relocate_kernel.S | 39 ------------------------------
3 files changed, 46 deletions(-)
diff --git a/arch/mips/include/asm/kexec.h b/arch/mips/include/asm/kexec.h
index a8e0bfc0da19..33f31a8bd8d3 100644
--- a/arch/mips/include/asm/kexec.h
+++ b/arch/mips/include/asm/kexec.h
@@ -41,9 +41,7 @@ extern void (*_machine_kexec_shutdown)(void);
extern void (*_machine_crash_shutdown)(struct pt_regs *regs);
void default_machine_crash_shutdown(struct pt_regs *regs);
#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;
void kexec_smp_reboot(void);
extern void (*_crash_smp_send_stop)(void);
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 900475ae256d..baffc7113204 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -27,7 +27,6 @@ int (*_machine_kexec_prepare)(struct kimage *) = NULL;
void (*_machine_kexec_shutdown)(void) = NULL;
void (*_machine_crash_shutdown)(struct pt_regs *regs) = NULL;
#ifdef CONFIG_SMP
-void (*relocated_kexec_smp_wait) (void *);
atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
void (*_crash_smp_send_stop)(void) = NULL;
@@ -142,10 +141,6 @@ machine_kexec(struct kimage *image)
printk("Bye ...\n");
__flush_cache_all();
#ifdef CONFIG_SMP
- /* All secondary cpus now may jump to kexec_wait cycle */
- relocated_kexec_smp_wait = reboot_code_buffer +
- (void *)(kexec_smp_wait - relocate_new_kernel);
- smp_wmb();
atomic_set(&kexec_ready_to_reboot, 1);
kexec_smp_reboot();
diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S
index c6bbf2165051..14e0eaf12306 100644
--- a/arch/mips/kernel/relocate_kernel.S
+++ b/arch/mips/kernel/relocate_kernel.S
@@ -100,45 +100,6 @@ done:
j s1
END(relocate_new_kernel)
-#ifdef CONFIG_SMP
-/*
- * Other CPUs should wait until code is relocated and
- * then start at entry (?) point.
- */
-LEAF(kexec_smp_wait)
- PTR_L a0, s_arg0
- PTR_L a1, s_arg1
- PTR_L a2, s_arg2
- PTR_L a3, s_arg3
- PTR_L s1, kexec_start_address
-
- /* Non-relocated address works for args and kexec_start_address ( old
- * kernel is not overwritten). But we need relocated address of
- * kexec_flag.
- */
-
- bal 1f
-1: move t1,ra;
- PTR_LA t2,1b
- PTR_LA t0,kexec_flag
- PTR_SUB t0,t0,t2;
- PTR_ADD t0,t1,t0;
-
-1: LONG_L s0, (t0)
- bne s0, zero,1b
-
-#ifdef CONFIG_CPU_CAVIUM_OCTEON
- .set push
- .set noreorder
- synci 0($0)
- .set pop
-#else
- sync
-#endif
- j s1
- END(kexec_smp_wait)
-#endif
-
#ifdef __mips64
/* all PTR's must be aligned to 8 byte in 64-bit mode */
.align 3
--
2.17.1
next prev parent reply other threads:[~2018-09-05 16:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 15:59 [PATCH v4 0/6] MIPS: kexec/kdump: Fix smp reboot and other issues Dengcheng Zhu
2018-09-05 15:59 ` [PATCH v4 1/6] MIPS: Make play_dead() work for kexec Dengcheng Zhu
2018-09-05 15:59 ` [PATCH v4 2/6] MIPS: kexec: Let the new kernel handle all CPUs Dengcheng Zhu
2018-09-05 15:59 ` Dengcheng Zhu [this message]
2018-09-05 15:59 ` [PATCH v4 4/6] MIPS: kexec: Do not flush system wide caches in machine_kexec() Dengcheng Zhu
2018-09-05 15:59 ` [PATCH v4 5/6] MIPS: kexec: Relax memory restriction Dengcheng Zhu
2018-09-05 15:59 ` [PATCH v4 6/6] MIPS: kexec: Use prepare method from Generic for UHI platforms Dengcheng Zhu
2018-09-05 22:54 ` [PATCH v4 0/6] MIPS: kexec/kdump: Fix smp reboot and other issues Paul Burton
2018-09-06 19:19 ` Dengcheng Zhu
2018-09-06 20:34 ` Paul Burton
2018-09-06 22:23 ` Dengcheng Zhu
2018-09-06 23:21 ` Paul Burton
2018-09-07 19:47 ` Dengcheng Zhu
2018-09-07 19:47 ` Dengcheng Zhu
2018-09-07 21:42 ` Paul Burton
2018-09-07 22:21 ` Dengcheng Zhu
2018-09-07 22:21 ` Dengcheng Zhu
2018-09-07 23:11 ` Paul Burton
2018-09-07 23:31 ` Dengcheng Zhu
2018-09-07 23:31 ` Dengcheng Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180905155909.30454-4-dzhu@wavecomp.com \
--to=dzhu@wavecomp.com \
--cc=linux-mips@linux-mips.org \
--cc=pburton@wavecomp.com \
--cc=rachel.mozes@intel.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox