From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 8/8] ARM: kexec: use soft_restart for branching to the reboot buffer
Date: Tue, 8 Nov 2011 15:53:03 +0000 [thread overview]
Message-ID: <1320767583-21162-9-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1320767583-21162-1-git-send-email-will.deacon@arm.com>
Now that there is a common way to reset the machine, let's use it
instead of reinventing the wheel in the kexec backend.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/kernel/machine_kexec.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index 29620b6..764bd45 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -12,12 +12,11 @@
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
#include <asm/mach-types.h>
+#include <asm/system.h>
extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size;
-extern void setup_mm_for_reboot(void);
-
extern unsigned long kexec_start_address;
extern unsigned long kexec_indirection_page;
extern unsigned long kexec_mach_type;
@@ -111,14 +110,6 @@ void machine_kexec(struct kimage *image)
if (kexec_reinit)
kexec_reinit();
- local_irq_disable();
- local_fiq_disable();
- setup_mm_for_reboot();
- flush_cache_all();
- outer_flush_all();
- outer_disable();
- cpu_proc_fin();
- outer_inv_all();
- flush_cache_all();
- cpu_reset(reboot_code_buffer_phys);
+
+ soft_restart(reboot_code_buffer_phys);
}
--
1.7.4.1
prev parent reply other threads:[~2011-11-08 15:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-08 15:52 [PATCH v5 0/8] kexec fixes and soft restart code Will Deacon
2011-11-08 15:52 ` [PATCH v5 1/8] Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage" Will Deacon
2011-11-08 15:52 ` [PATCH v5 2/8] ARM: lib: add call_with_stack function for safely changing stack Will Deacon
2011-11-08 15:52 ` [PATCH v5 3/8] ARM: idmap: populate identity map pgd at init time Will Deacon
2011-11-12 11:14 ` Russell King - ARM Linux
2011-11-13 12:20 ` Will Deacon
2011-11-08 15:52 ` [PATCH v5 4/8] ARM: reset: allow kernelspace mappings to be flat mapped during reset Will Deacon
2011-11-08 15:53 ` [PATCH v5 5/8] ARM: reset: implement soft_restart for jumping to a physical address Will Deacon
2011-11-08 15:53 ` [PATCH v5 6/8] ARM: soft_restart: disable the outer L2 when the last CPU is going down Will Deacon
2011-11-08 15:53 ` [PATCH v5 7/8] ARM: stop: execute platform callback from cpu_stop code Will Deacon
2011-11-08 15:53 ` Will Deacon [this message]
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=1320767583-21162-9-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).