From: nico@fluxnic.net (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 2/8] ARM: kexec: ensure new kernel is entered in ARM state
Date: Tue, 23 Aug 2011 21:28:12 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.00.1108232126550.20358@xanadu.home> (raw)
In-Reply-To: <1314136012-20533-3-git-send-email-will.deacon@arm.com>
On Tue, 23 Aug 2011, Will Deacon wrote:
> Commit 540b5738 ("ARM: 6999/1: head, zImage: Always Enter the kernel in
> ARM state") mandates that the kernel should be entered in ARM state.
>
> If a Thumb-2 kernel kexecs a new kernel image, we need to ensure that
> we change state when branching to the new code. This patch replaces a
> mov pc, lr with a bx lr so that we transition to ARM state if need be.
This will break kexec support on ARMv4 targets. No idea if any ARMv4
target uses kexec though.
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm/kernel/relocate_kernel.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
> index 9cf4cbf..0908633 100644
> --- a/arch/arm/kernel/relocate_kernel.S
> +++ b/arch/arm/kernel/relocate_kernel.S
> @@ -57,7 +57,7 @@ relocate_new_kernel:
> mov r0,#0
> ldr r1,kexec_mach_type
> ldr r2,kexec_boot_atags
> - mov pc,lr
> + bx lr
>
> .align
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
next prev parent reply other threads:[~2011-08-24 1:28 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 [this message]
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 ` [PATCH v4 7/8] ARM: kexec: use arm_machine_reset for branching to the reboot buffer Will Deacon
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=alpine.LFD.2.00.1108232126550.20358@xanadu.home \
--to=nico@fluxnic.net \
--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.