linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 7/8] ARM: kexec: use arm_machine_reset for branching to the reboot buffer
Date: Tue, 23 Aug 2011 22:46:51 +0100	[thread overview]
Message-ID: <1314136012-20533-8-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1314136012-20533-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 |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index dfc1784..f84567c 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -16,8 +16,6 @@
 extern const unsigned char relocate_new_kernel[];
 extern const unsigned int relocate_new_kernel_size;
 
-extern void setup_mm_for_reboot(char mode, pgd_t *pgd);
-
 extern unsigned long kexec_start_address;
 extern unsigned long kexec_indirection_page;
 extern unsigned long kexec_mach_type;
@@ -111,14 +109,6 @@ void machine_kexec(struct kimage *image)
 
 	if (kexec_reinit)
 		kexec_reinit();
-	local_irq_disable();
-	local_fiq_disable();
-	setup_mm_for_reboot(0, NULL); /* mode is not used, so just pass 0*/
-	flush_cache_all();
-	outer_flush_all();
-	outer_disable();
-	cpu_proc_fin();
-	outer_inv_all();
-	flush_cache_all();
-	cpu_reset(reboot_code_buffer_phys);
+
+	arm_machine_reset(reboot_code_buffer_phys);
 }
-- 
1.7.0.4

  parent reply	other threads:[~2011-08-23 21:46 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-23 21:46 [PATCH v4 0/8] MMU disabling code and kexec fixes Will Deacon
2011-08-23 21:46 ` [PATCH v4 1/8] ARM: proc-v7: disable SCTLR.TE when disabling MMU Will Deacon
2011-08-24 10:15   ` Dave Martin
2011-08-24 11:01     ` Will Deacon
2011-08-25 11:19       ` Dave Martin
2011-08-23 21:46 ` [PATCH v4 2/8] ARM: kexec: ensure new kernel is entered in ARM state Will Deacon
2011-08-24  1:28   ` Nicolas Pitre
2011-08-24 10:17     ` Dave Martin
2011-08-24 11:13     ` Will Deacon
2011-08-24 10:16   ` Dave Martin
2011-08-23 21:46 ` [PATCH v4 3/8] ARM: lib: add switch_stack function for safely changing stack Will Deacon
2011-08-24  1:07   ` Nicolas Pitre
2011-08-24 10:19     ` Dave Martin
2011-08-24 11:14     ` Will Deacon
2011-08-23 21:46 ` [PATCH v4 4/8] ARM: idmap: add header file for identity mapping functions Will Deacon
2011-08-23 21:46 ` [PATCH v4 5/8] ARM: reset: allow kernelspace mappings to be flat mapped during reset Will Deacon
2011-08-23 21:46 ` [PATCH v4 6/8] ARM: reset: add reset functionality for jumping to a physical address Will Deacon
2011-08-23 21:46 ` Will Deacon [this message]
2011-08-23 21:46 ` [PATCH v4 8/8] ARM: stop: execute platform callback from cpu_stop code Will Deacon
2011-08-24  1:25 ` [PATCH v4 0/8] MMU disabling code and kexec fixes Nicolas Pitre
2011-08-24 10:58   ` Will Deacon
2011-08-24 14:53     ` Nicolas Pitre
2011-08-24 16:59       ` Will Deacon
2011-08-24 17:30         ` Nicolas Pitre
2011-08-24 17:45           ` Will Deacon
2011-08-25 13:16             ` Will Deacon
2011-08-24 12:34 ` Jamie Iles
2011-08-24 12:42   ` Will Deacon
2011-08-24 12:54     ` Jamie Iles

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=1314136012-20533-8-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).