diff options
| author | Arve Hjønnevåg <arve@android.com> | 2012-12-01 01:05:40 +0000 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:09 +0900 |
| commit | af1a9bbee5c79389039b6bc456865e2029097481 (patch) | |
| tree | 3ad3a0154b097a8df3dd1d728431e65b61407048 /arch/arm/boot/compressed | |
| parent | bbfbea1f4d16c0e66595297f5b8cb6607b33bf64 (diff) | |
| download | linux-3.10-af1a9bbee5c79389039b6bc456865e2029097481.tar.gz linux-3.10-af1a9bbee5c79389039b6bc456865e2029097481.tar.bz2 linux-3.10-af1a9bbee5c79389039b6bc456865e2029097481.zip | |
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/arm/boot/compressed')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 032a8d98714..a7cd6738388 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 |