diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-03-17 17:59:01 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-03-17 17:59:01 +1100 |
commit | 831532035b12a5f7b600515a6f4da0b207b82d6e (patch) | |
tree | 8abc96a8098984f517c6dadba6b4f3176cd519cb /arch/powerpc/mm | |
parent | b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e (diff) | |
parent | 21a06b0459f5e3ecdeccacfbf076c229514c1840 (diff) | |
download | kernel_samsung_smdk4412-831532035b12a5f7b600515a6f4da0b207b82d6e.tar.gz kernel_samsung_smdk4412-831532035b12a5f7b600515a6f4da0b207b82d6e.tar.bz2 kernel_samsung_smdk4412-831532035b12a5f7b600515a6f4da0b207b82d6e.zip |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index af405eefe48..7c63c0ed4f1 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S @@ -189,6 +189,13 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_47x) blr #ifdef CONFIG_PPC_47x + +/* + * 47x variant of icbt + */ +# define ICBT(CT,RA,RB) \ + .long 0x7c00002c | ((CT) << 21) | ((RA) << 16) | ((RB) << 11) + /* * _tlbivax_bcast is only on 47x. We don't bother doing a runtime * check though, it will blow up soon enough if we mistakenly try @@ -206,7 +213,35 @@ _GLOBAL(_tlbivax_bcast) isync eieio tlbsync +BEGIN_FTR_SECTION + b 1f +END_FTR_SECTION_IFSET(CPU_FTR_476_DD2) + sync + wrtee r10 + blr +/* + * DD2 HW could hang if in instruction fetch happens before msync completes. + * Touch enough instruction cache lines to ensure cache hits + */ +1: mflr r9 + bl 2f +2: mflr r6 + li r7,32 + ICBT(0,r6,r7) /* touch next cache line */ + add r6,r6,r7 + ICBT(0,r6,r7) /* touch next cache line */ + add r6,r6,r7 + ICBT(0,r6,r7) /* touch next cache line */ sync + nop + nop + nop + nop + nop + nop + nop + nop + mtlr r9 wrtee r10 blr #endif /* CONFIG_PPC_47x */ |