From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/10] ARM: proc: add definition of cpu_reset for ARMv6 and ARMv7 cores
Date: Thu, 9 Jun 2011 16:58:55 +0100 [thread overview]
Message-ID: <1307635142-11312-4-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1307635142-11312-1-git-send-email-will.deacon@arm.com>
This patch adds simple definitions of cpu_reset for ARMv6 and ARMv7
cores, which disable the MMU via the SCTLR.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/mm/proc-v6.S | 5 +++++
arch/arm/mm/proc-v7.S | 7 +++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 1d2b845..f3b5232 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -56,6 +56,11 @@ ENTRY(cpu_v6_proc_fin)
*/
.align 5
ENTRY(cpu_v6_reset)
+ mrc p15, 0, r1, c1, c0, 0 @ ctrl register
+ bic r1, r1, #0x1 @ ...............m
+ mcr p15, 0, r1, c1, c0, 0 @ disable MMU
+ mov r1, #0
+ mcr p15, 0, r1, c7, c5, 4 @ ISB
mov pc, r0
/*
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index b3b566e..776443a 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -58,9 +58,16 @@ ENDPROC(cpu_v7_proc_fin)
* to what would be the reset vector.
*
* - loc - location to jump to for soft reset
+ *
+ * This code must be executed using a flat identity mapping with
+ * caches disabled.
*/
.align 5
ENTRY(cpu_v7_reset)
+ mrc p15, 0, r1, c1, c0, 0 @ ctrl register
+ bic r1, r1, #0x1 @ ...............m
+ mcr p15, 0, r1, c1, c0, 0 @ disable MMU
+ isb
mov pc, r0
ENDPROC(cpu_v7_reset)
--
1.7.0.4
next prev parent reply other threads:[~2011-06-09 15:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-09 15:58 [PATCH v2 00/10] MMU disabling code and kexec fixes Will Deacon
2011-06-09 15:58 ` [PATCH v2 01/10] ARM: l2x0: fix disabling function to avoid livelock Will Deacon
2011-06-09 15:58 ` [PATCH v2 02/10] ARM: l2x0: fix invalidate-all " Will Deacon
2011-06-09 15:58 ` Will Deacon [this message]
2011-06-09 15:58 ` [PATCH v2 04/10] ARM: lib: add switch_stack function for safely changing stack Will Deacon
2011-06-09 16:11 ` Dave Martin
2011-06-09 16:20 ` Dave Martin
2011-06-09 15:58 ` [PATCH v2 05/10] ARM: idmap: add header file for identity mapping functions Will Deacon
2011-06-10 9:13 ` Frank Hofmann
2011-06-09 15:58 ` [PATCH v2 06/10] ARM: reset: allow kernelspace mappings to be flat mapped during reset Will Deacon
2011-06-09 15:58 ` [PATCH v2 07/10] ARM: multi-cpu: remove arguments from CPU proc macros Will Deacon
2011-06-09 15:59 ` [PATCH v2 08/10] ARM: reset: add reset functionality for jumping to a physical address Will Deacon
2011-06-09 15:59 ` [PATCH v2 09/10] ARM: kexec: use arm_machine_reset for branching to the reboot buffer Will Deacon
2011-06-09 15:59 ` [PATCH v2 10/10] 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=1307635142-11312-4-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.