[src/trunk]: src/sys/arch/arm/include/arm32 Fix the CACHE_MASKs for armv6 to ...

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

details:   https://anonhg.NetBSD.org/src/rev/9e7b0558c33e
branches:  trunk
changeset: 781503:9e7b0558c33e
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Sep 11 15:28:14 2012 +0000

description:
Fix the CACHE_MASKs for armv6 to include TEX and S bits.
Fix a comment in pte.h

diffstat:

 sys/arch/arm/include/arm32/pmap.h |  8 ++++----
 sys/arch/arm/include/arm32/pte.h  |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 005822a1dba6 -r 9e7b0558c33e sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Tue Sep 11 12:31:08 2012 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Tue Sep 11 15:28:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.110 2012/09/07 11:48:59 matt Exp $  */
+/*     $NetBSD: pmap.h,v 1.111 2012/09/11 15:28:14 matt Exp $  */
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -595,7 +595,7 @@
 #define        L1_S_CACHE_MASK_generic (L1_S_B|L1_S_C)
 #define        L1_S_CACHE_MASK_xscale  (L1_S_B|L1_S_C|L1_S_XS_TEX(TEX_XSCALE_X))
 #define        L1_S_CACHE_MASK_armv6   (L1_S_B|L1_S_C|L1_S_XS_TEX(TEX_ARMV6_TEX))
-#define        L1_S_CACHE_MASK_armv7   (L1_S_B|L1_S_C)
+#define        L1_S_CACHE_MASK_armv7   (L1_S_B|L1_S_C|L1_S_XS_TEX(TEX_ARMV6_TEX)|L1_S_V6_S)
 
 #define        L2_L_PROT_U_generic     (L2_AP(AP_U))
 #define        L2_L_PROT_W_generic     (L2_AP(AP_W))
@@ -620,7 +620,7 @@
 #define        L2_L_CACHE_MASK_generic (L2_B|L2_C)
 #define        L2_L_CACHE_MASK_xscale  (L2_B|L2_C|L2_XS_L_TEX(TEX_XSCALE_X))
 #define        L2_L_CACHE_MASK_armv6   (L2_B|L2_C|L2_V6_L_TEX(TEX_ARMV6_TEX))
-#define        L2_L_CACHE_MASK_armv7   (L2_B|L2_C)
+#define        L2_L_CACHE_MASK_armv7   (L2_B|L2_C|L2_V6_L_TEX(TEX_ARMV6_TEX)|L2_XS_S)
 
 #define        L2_S_PROT_U_generic     (L2_AP(AP_U))
 #define        L2_S_PROT_W_generic     (L2_AP(AP_W))
@@ -651,7 +651,7 @@
 #else
 #define        L2_S_CACHE_MASK_armv6c  L2_S_CACHE_MASK_generic
 #endif
-#define        L2_S_CACHE_MASK_armv7   (L2_B|L2_C)
+#define        L2_S_CACHE_MASK_armv7   (L2_B|L2_C|L2_V6_XS_TEX(TEX_ARMV6_TEX)|L2_XS_S)
 
 
 #define        L1_S_PROTO_generic      (L1_TYPE_S | L1_S_IMP)
diff -r 005822a1dba6 -r 9e7b0558c33e sys/arch/arm/include/arm32/pte.h
--- a/sys/arch/arm/include/arm32/pte.h  Tue Sep 11 12:31:08 2012 +0000
+++ b/sys/arch/arm/include/arm32/pte.h  Tue Sep 11 15:28:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.12 2012/08/20 13:03:41 matt Exp $    */
+/*     $NetBSD: pte.h,v 1.13 2012/09/11 15:28:14 matt Exp $    */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -198,7 +198,7 @@
 #define        L2_TYPE_INV     0x00            /* Invalid (fault) */
 #define        L2_TYPE_L       0x01            /* Large Page */
 #define        L2_TYPE_S       0x02            /* Small Page */
-#define        L2_TYPE_T       0x03            /* Tiny Page */
+#define        L2_TYPE_T       0x03            /* Tiny Page (not armv7) */
 #define        L2_TYPE_MASK    0x03            /* mask of type bits */
 
        /*