diff options
author | Will Deacon <will.deacon@arm.com> | 2013-02-28 11:48:40 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-03 17:54:16 -0500 |
commit | 89c7e4b8bbb3d4fa52df5746a8ad38e610143651 (patch) | |
tree | f6d3d835f5fca88fd4de01f166d782f16c2fe3c9 /arch/arm/mm/context.c | |
parent | 862c588f062fe9339a180cf6429e4df1855c376a (diff) |
ARM: 7661/1: mm: perform explicit branch predictor maintenance when required
The ARM ARM requires branch predictor maintenance if, for a given ASID,
the instructions at a specific virtual address appear to change.
From the kernel's point of view, that means:
- Changing the kernel's view of memory (e.g. switching to the
identity map)
- ASID rollover (since ASIDs will be re-allocated to new tasks)
This patch adds explicit branch predictor maintenance when either of the
two conditions above are met.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/context.c')
-rw-r--r-- | arch/arm/mm/context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c index 44d4ee52f3e2..a5a4b2bc42ba 100644 --- a/arch/arm/mm/context.c +++ b/arch/arm/mm/context.c | |||
@@ -212,8 +212,10 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk) | |||
212 | atomic64_set(&mm->context.id, asid); | 212 | atomic64_set(&mm->context.id, asid); |
213 | } | 213 | } |
214 | 214 | ||
215 | if (cpumask_test_and_clear_cpu(cpu, &tlb_flush_pending)) | 215 | if (cpumask_test_and_clear_cpu(cpu, &tlb_flush_pending)) { |
216 | local_flush_bp_all(); | ||
216 | local_flush_tlb_all(); | 217 | local_flush_tlb_all(); |
218 | } | ||
217 | 219 | ||
218 | atomic64_set(&per_cpu(active_asids, cpu), asid); | 220 | atomic64_set(&per_cpu(active_asids, cpu), asid); |
219 | cpumask_set_cpu(cpu, mm_cpumask(mm)); | 221 | cpumask_set_cpu(cpu, mm_cpumask(mm)); |