All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 8/9] ARM: kexec: use arm_machine_reset for branching to the reboot buffer
Date: Wed, 15 Jun 2011 18:23:19 +0100	[thread overview]
Message-ID: <1308158600-7169-9-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1308158600-7169-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 e59bbd4..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);
-
 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); /* 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-06-15 17:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-15 17:23 [PATCH v3 0/9] MMU disabling code and kexec fixes Will Deacon
2011-06-15 17:23 ` [PATCH v3 1/9] ARM: l2x0: fix disabling function to avoid deadlock Will Deacon
2011-06-16 14:53   ` Catalin Marinas
2011-06-15 17:23 ` [PATCH v3 2/9] ARM: proc: add definition of cpu_reset for ARMv6 and ARMv7 cores Will Deacon
2011-06-15 17:23 ` [PATCH v3 3/9] ARM: lib: add switch_stack function for safely changing stack Will Deacon
2011-06-15 17:23 ` [PATCH v3 4/9] ARM: idmap: add header file for identity mapping functions Will Deacon
2011-06-15 17:23 ` [PATCH v3 5/9] ARM: reset: allow kernelspace mappings to be flat mapped during reset Will Deacon
2011-06-15 17:23 ` [PATCH v3 6/9] ARM: multi-cpu: remove arguments from CPU proc macros Will Deacon
2011-06-15 17:23 ` [PATCH v3 7/9] ARM: reset: add reset functionality for jumping to a physical address Will Deacon
2011-06-15 17:23 ` Will Deacon [this message]
2011-06-15 17:23 ` [PATCH v3 9/9] ARM: stop: execute platform callback from cpu_stop code Will Deacon

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=1308158600-7169-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.