diff options
| author | Bo Yan <byan@nvidia.com> | 2013-04-05 19:10:26 -0700 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2013-04-08 11:04:15 -0700 |
| commit | c7cc6aa56f184389203f380df1e39e94e2e2d6f5 (patch) | |
| tree | 4fdea3ae543aebc599b46ed3fceff6b3dda1a9e8 /arch/arm/include | |
| parent | 2ff268712b9cbc6b6ef17a1d06748dd2c985dddc (diff) | |
Revert "arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)"
This reverts commit e11ccb30b44fc55ba0576f5082e5e17e9a1d1854.
Change-Id: Ic96a1b8629778470de0fea1df9bac950ab98bf1f
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/217076
Reviewed-by: Gary Zhang <garyz@nvidia.com>
Tested-by: Joshua Widen <jwiden@nvidia.com>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/highmem.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu_context.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/tlbflush.h | 15 |
3 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h index 91b99abe7a95..8c5e828f484d 100644 --- a/arch/arm/include/asm/highmem.h +++ b/arch/arm/include/asm/highmem.h @@ -41,13 +41,6 @@ extern void kunmap_high(struct page *page); #endif #endif -/* - * Needed to be able to broadcast the TLB invalidation for kmap. - */ -#ifdef CONFIG_ARM_ERRATA_798181 -#undef ARCH_NEEDS_KMAP_HIGH_GET -#endif - #ifdef ARCH_NEEDS_KMAP_HIGH_GET extern void *kmap_high_get(struct page *page); #else diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h index 20d1dfeccfe3..a0b3cac0547c 100644 --- a/arch/arm/include/asm/mmu_context.h +++ b/arch/arm/include/asm/mmu_context.h @@ -125,13 +125,6 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, #endif check_context(next); cpu_switch_mm(next->pgd, next); -#ifdef CONFIG_ARM_ERRATA_798181 - /* - * DMB required since we only send IPI to the other CPUs if - * they run the same mm as the one being invalidated. - */ - dmb(); -#endif if (cache_is_vivt()) cpumask_clear_cpu(cpu, mm_cpumask(prev)); } diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h index 9b4541e784a2..85fe61e73202 100644 --- a/arch/arm/include/asm/tlbflush.h +++ b/arch/arm/include/asm/tlbflush.h @@ -447,21 +447,6 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr) } } -#ifdef CONFIG_ARM_ERRATA_798181 -static inline void dummy_flush_tlb_a15_erratum(void) -{ - /* - * Dummy TLBIMVAIS. Using the unmapped address 0 and ASID 0. - */ - asm("mcr p15, 0, %0, c8, c3, 1" : : "r" (0)); - dsb(); -} -#else -static inline void dummy_flush_tlb_a15_erratum(void) -{ -} -#endif - /* * flush_pmd_entry * |