Module Name: src
Committed By: matt
Date: Tue Sep 11 15:28:15 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: pmap.h pte.h
Log Message:
Fix the CACHE_MASKs for armv6 to include TEX and S bits.
Fix a comment in pte.h
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/arm32/pte.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.110 src/sys/arch/arm/include/arm32/pmap.h:1.111
--- src/sys/arch/arm/include/arm32/pmap.h:1.110 Fri Sep 7 11:48:59 2012
+++ src/sys/arch/arm/include/arm32/pmap.h Tue Sep 11 15:28:14 2012
@@ -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 @@ extern void (*pmap_zero_page_func)(paddr
#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 @@ extern void (*pmap_zero_page_func)(paddr
#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 @@ extern void (*pmap_zero_page_func)(paddr
#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)
Index: src/sys/arch/arm/include/arm32/pte.h
diff -u src/sys/arch/arm/include/arm32/pte.h:1.12 src/sys/arch/arm/include/arm32/pte.h:1.13
--- src/sys/arch/arm/include/arm32/pte.h:1.12 Mon Aug 20 13:03:41 2012
+++ src/sys/arch/arm/include/arm32/pte.h Tue Sep 11 15:28:14 2012
@@ -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 @@ typedef uint32_t pt_entry_t; /* L2 table
#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 */
/*
