Page MenuHomeFreeBSD
Files F135718689

D11703.id31103.diff
No OneTemporary
Actions

D11703.id31103.diff
View Options

Index: sys/arm/arm/pmap-v6.c
===================================================================
--- sys/arm/arm/pmap-v6.c
+++ sys/arm/arm/pmap-v6.c
@@ -525,8 +525,8 @@
int old_idx, new_idx;
/* Map VM memattrs to indexes to tex_class table. */
- old_idx = pte2_attr_tab[(int)old_attr];
- new_idx = pte2_attr_tab[(int)new_attr];
+ old_idx = PTE2_ATTR2IDX(pte2_attr_tab[(int)old_attr]);
+ new_idx = PTE2_ATTR2IDX(pte2_attr_tab[(int)new_attr]);
/* Replace TEX attribute and apply it. */
tex_class[old_idx] = tex_class[new_idx];
Index: sys/arm/include/pte-v6.h
===================================================================
--- sys/arm/include/pte-v6.h
+++ sys/arm/include/pte-v6.h
@@ -149,10 +149,12 @@
#define L2_NX 0x00000001 /* Not executable */
#define L2_B 0x00000004 /* Bufferable page */
#define L2_C 0x00000008 /* Cacheable page */
+#define L2_CB_SHIFT 2 /* C,B bit field shift */
#define L2_AP(x) ((x) << 4)
#define L2_AP0 0x00000010 /* access permissions bit 0*/
#define L2_AP1 0x00000020 /* access permissions bit 1*/
-#define L2_TEX(x) ((x) << 6) /* type extension */
+#define L2_TEX_SHIFT 6 /* type extension field shift */
+#define L2_TEX(x) ((x) << L2_TEX_SHIFT) /* type extension */
#define L2_TEX0 0x00000040 /* type extension bit 0 */
#define L2_TEX1 0x00000080 /* type extension bit 1 */
#define L2_TEX2 0x00000100 /* type extension bit 2 */
@@ -271,6 +273,10 @@
#define PTE2_FRAME L2_S_FRAME
#define PTE2_ATTR_MASK (L2_TEX0 | L2_C | L2_B)
+/* PTE2 attributes to TEX class index: (TEX0 C B) */
+#define PTE2_ATTR2IDX(attr) \
+ ((((attr) & (L2_C | L2_B)) >> L2_CB_SHIFT) | \
+ (((attr) & L2_TEX0) >> (L2_TEX_SHIFT - L2_CB_SHIFT)))
#define PTE2_AP_KR (PTE2_RO | PTE2_NM)
#define PTE2_AP_KRW 0

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 13, 4:43 AM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25245357
Default Alt Text
D11703.id31103.diff (1 KB)

Event Timeline