[src/trunk]: src/sys/arch/arm/arm PR/52934: Yasushi Oshima: Apply the erratum...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84592296892c
branches:  trunk
changeset: 358866:84592296892c
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 20 14:43:25 2018 +0000

description:
PR/52934: Yasushi Oshima: Apply the erratum fix that was applied to wbinv_range
to isync_range so that we don't hang when we try to sync from execcmd_readvn().
XXX: pullup 8

diffstat:

 sys/arch/arm/arm/cpufunc_asm_arm11x6.S |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 6597ffce58c6 -r 84592296892c sys/arch/arm/arm/cpufunc_asm_arm11x6.S
--- a/sys/arch/arm/arm/cpufunc_asm_arm11x6.S    Sat Jan 20 14:39:21 2018 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_arm11x6.S    Sat Jan 20 14:43:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc_asm_arm11x6.S,v 1.9 2017/07/15 06:25:20 skrll Exp $    */
+/*     $NetBSD: cpufunc_asm_arm11x6.S,v 1.10 2018/01/20 14:43:25 christos Exp $        */
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -63,7 +63,7 @@
 #include <machine/asm.h>
 #include <arm/locore.h>
 
-RCSID("$NetBSD: cpufunc_asm_arm11x6.S,v 1.9 2017/07/15 06:25:20 skrll Exp $")
+RCSID("$NetBSD: cpufunc_asm_arm11x6.S,v 1.10 2018/01/20 14:43:25 christos Exp $")
 
 #if 0
 #define Invalidate_I_cache(Rtmp1, Rtmp2) \
@@ -137,6 +137,11 @@
 END(arm11x6_flush_prefetchbuf)
 
 ENTRY_NP(arm11x6_icache_sync_range)
+       ldr     r2, .Larm_pcache
+       ldr     r2, [r2, #DCACHE_SIZE]
+       cmp     r1, r2
+       bge     arm11x6_icache_sync_all
+
        add     r1, r1, r0
        sub     r1, r1, #1
        /* Erratum ARM1136 371025, workaround #2 */