ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
authorWill Deacon <will.deacon@arm.com>
Fri, 7 Feb 2014 18:12:20 +0000 (19:12 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 1 Apr 2014 23:58:50 +0000 (00:58 +0100)
commitb768f21422c7ba677c3a2e594881fd412984e665
tree2447691e74fddc6ed45cb697a8d3e0d328858abb
parent1199a29a07b529adedb1623dd2a6e17c33c763f2
ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU

commit bae0ca2bc550d1ec6a118fb8f2696f18c4da3d8e upstream.

During __v{6,7}_setup, we invalidate the TLBs since we are about to
enable the MMU on return to head.S. Unfortunately, without a subsequent
dsb instruction, the invalidation is not guaranteed to have completed by
the time we write to the sctlr, potentially exposing us to junk/stale
translations cached in the TLB.

This patch reworks the init functions so that the dsb used to ensure
completion of cache/predictor maintenance is also used to ensure
completion of the TLB invalidation.

Reported-by: Albin Tonnerre <Albin.Tonnerre@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S