summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2012-11-30 17:05:40 -0800
committerNitin Garg <nitin.garg@freescale.com>2014-04-21 22:35:18 -0500
commitd5cda5f76a3741ba1525fc6e0043ec6764ea3ad4 (patch)
tree7b4230583d2007c8271fde75d66f69ba66228012 /arch
parent00c921d4a67b22cf8e07872e68fb256b30b3267b (diff)
ARM: decompressor: Flush tlb before swiching domain 0 to client mode
If the bootloader used a page table that is incompatible with domain 0 in client mode, and boots with the mmu on, then swithing domain 0 to client mode causes a fault if we don't flush the tlb after updating the page table pointer. v2: Add ISB before loading dacr. Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/compressed/head.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 032a8d987148..a7cd67383883 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -717,6 +717,8 @@ __armv7_mmu_cache_on:
bic r6, r6, #1 << 31 @ 32-bit translation system
bic r6, r6, #3 << 0 @ use only ttbr0
mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer
+ mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs
+ mcr p15, 0, r0, c7, c5, 4 @ ISB
mcrne p15, 0, r1, c3, c0, 0 @ load domain access control
mcrne p15, 0, r6, c2, c0, 2 @ load ttb control
#endif