Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/arch/arm/arm Pull up following revision(s) (requested...



details:   https://anonhg.NetBSD.org/src/rev/148a4b7db490
branches:  netbsd-8
changeset: 434574:148a4b7db490
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 22 12:32:38 2018 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #507):
        sys/arch/arm/arm/cpufunc_asm_arm11x6.S: revision 1.10
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 bd3b59207fe1 -r 148a4b7db490 sys/arch/arm/arm/cpufunc_asm_arm11x6.S
--- a/sys/arch/arm/arm/cpufunc_asm_arm11x6.S    Mon Jan 22 12:30:20 2018 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_arm11x6.S    Mon Jan 22 12:32:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc_asm_arm11x6.S,v 1.7.20.1 2017/07/12 13:44:47 martin Exp $      */
+/*     $NetBSD: cpufunc_asm_arm11x6.S,v 1.7.20.2 2018/01/22 12:32:38 martin 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.7.20.1 2017/07/12 13:44:47 martin Exp $")
+RCSID("$NetBSD: cpufunc_asm_arm11x6.S,v 1.7.20.2 2018/01/22 12:32:38 martin 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 */



Home | Main Index | Thread Index | Old Index