From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 1/8] ARM: proc-v7: disable SCTLR.TE when disabling MMU
Date: Tue, 23 Aug 2011 22:46:45 +0100 [thread overview]
Message-ID: <1314136012-20533-2-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1314136012-20533-1-git-send-email-will.deacon@arm.com>
cpu_v7_reset disables the MMU and then branches to the provided address.
On Thumb-2 kernels, we should take care to clear the Thumb Exception
enable bit in the System Control Register, otherwise this may wreak
havok in the code to which we are branching (for example, an ARM kernel
image via kexec).
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/mm/proc-v7.S | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index a30e785..96b872c 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -66,6 +66,7 @@ ENDPROC(cpu_v7_proc_fin)
ENTRY(cpu_v7_reset)
mrc p15, 0, r1, c1, c0, 0 @ ctrl register
bic r1, r1, #0x1 @ ...............m
+ THUMB( bic r1, r1, #1 << 30 ) @ Thumb exceptions
mcr p15, 0, r1, c1, c0, 0 @ disable MMU
isb
mov pc, r0
--
1.7.0.4
next prev 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 ` Will Deacon [this message]
2011-08-24 10:15 ` [PATCH v4 1/8] ARM: proc-v7: disable SCTLR.TE when disabling MMU 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 ` [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=1314136012-20533-2-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).