[src/trunk]: src/sys/arch/arm/arm For now, don't reset arm_cache_prefer_mask ...

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

details:   https://anonhg.NetBSD.org/src/rev/eae18629a14b
branches:  trunk
changeset: 326876:eae18629a14b
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Feb 21 06:28:25 2014 +0000

description:
For now, don't reset arm_cache_prefer_mask unless both l1 caches are PIPT

diffstat:

 sys/arch/arm/arm/cpufunc.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r f0f86cc859ad -r eae18629a14b sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Fri Feb 21 02:42:41 2014 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Fri Feb 21 06:28:25 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.139 2014/02/20 23:24:55 matt Exp $       */
+/*     $NetBSD: cpufunc.c,v 1.140 2014/02/21 06:28:25 matt Exp $       */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.139 2014/02/20 23:24:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.140 2014/02/21 06:28:25 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1595,7 +1595,8 @@
                        if (arm_scache.dcache_line_size < arm_dcache_align)
                                arm_dcache_align = arm_scache.dcache_line_size;
                }
-               if (arm_pcache.dcache_type == CACHE_TYPE_PIPT) {
+               if (arm_pcache.dcache_type == CACHE_TYPE_PIPT
+                   && arm_pcache.icache_type == CACHE_TYPE_PIPT) {
                        arm_cache_prefer_mask = 0;
                }
                goto out;