diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-07 21:56:08 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-07 21:56:08 +0000 |
| commit | 12b83adcec39b3d75a0668689115dcd7f3f222a3 (patch) | |
| tree | 0d0d9c12e529a96275793658573ccc0e0ccebc5b /sys/arch | |
| parent | 32186ec30002874db64d52ca745048834a153ae7 (diff) | |
For consistency sake, apply the inner shareable attribute to the bootstrap
pagetables as well. Also replace the number for write-back with a proper
define.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/locore.S | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/arm64/pmap.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/arm64/arm64/locore.S b/sys/arch/arm64/arm64/locore.S index a2f1d0d81ee..795120114f8 100644 --- a/sys/arch/arm64/arm64/locore.S +++ b/sys/arch/arm64/arm64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.12 2017/02/06 19:23:45 patrick Exp $ */ +/* $OpenBSD: locore.S,v 1.13 2017/02/07 21:56:07 patrick Exp $ */ /*- * Copyright (c) 2012-2014 Andrew Turner * All rights reserved. @@ -510,6 +510,7 @@ build_l1_block_pagetable: lsl x12, x7, #2 orr x12, x12, #L1_BLOCK orr x12, x12, #(ATTR_AF) + orr x12, x12, ATTR_SH(SH_INNER) /* Only use the output address bits */ lsr x9, x9, #L1_SHIFT @@ -548,6 +549,7 @@ build_l2_block_pagetable: lsl x12, x7, #2 orr x12, x12, #L2_BLOCK orr x12, x12, #(ATTR_AF) + orr x12, x12, ATTR_SH(SH_INNER) /* Only use the output address bits */ lsr x9, x9, #L2_SHIFT diff --git a/sys/arch/arm64/arm64/pmap.c b/sys/arch/arm64/arm64/pmap.c index 05290eb7801..8aafdd74a07 100644 --- a/sys/arch/arm64/arm64/pmap.c +++ b/sys/arch/arm64/arm64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.18 2017/02/06 19:23:45 patrick Exp $ */ +/* $OpenBSD: pmap.c,v 1.19 2017/02/07 21:56:07 patrick Exp $ */ /* * Copyright (c) 2008-2009,2014-2016 Dale Rahn <drahn@dalerahn.com> * @@ -1262,7 +1262,8 @@ pmap_bootstrap(long kvo, paddr_t lpt1, long kernelstart, long kernelend, if (mapva < (vaddr_t)&_end) continue; vp2->l2[VP_IDX2(mapva)] = mappa | L2_BLOCK | - ATTR_AF| ATTR_IDX(2); + ATTR_AF | ATTR_IDX(PTE_ATTR_WB) | + ATTR_SH(SH_INNER); } } |