[src/netbsd-9]: src/sys/arch/aarch64/aarch64 Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/7f68c65cf9e2
branches:  netbsd-9
changeset: 458377:7f68c65cf9e2
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 22 12:39:36 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #226):

        sys/arch/aarch64/aarch64/locore.S: revision 1.40

Map device memory for early console XN

diffstat:

 sys/arch/aarch64/aarch64/locore.S |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 13422e4cb03c -r 7f68c65cf9e2 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Sun Sep 22 12:37:39 2019 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Sun Sep 22 12:39:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.39 2019/07/17 08:39:03 skrll Exp $        */
+/*     $NetBSD: locore.S,v 1.39.2.1 2019/09/22 12:39:36 martin Exp $   */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -38,7 +38,7 @@
 #include <aarch64/hypervisor.h>
 #include "assym.h"
 
-RCSID("$NetBSD: locore.S,v 1.39 2019/07/17 08:39:03 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.39.2.1 2019/09/22 12:39:36 martin Exp $")
 
 
 /*#define DEBUG_LOCORE                 /* debug print */
@@ -766,6 +766,7 @@
        adr     x6, bootpage_alloc              /* allocator */
        mov     x5, xzr                         /* flags = 0 */
        mov     x4, #LX_BLKPAG_ATTR_DEVICE_MEM|LX_BLKPAG_AP_RW  /* attr */
+       orr     x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
        mov     x3, #L2_SIZE                    /* blocksize */
        mov     x2, #L2_SIZE                    /* size */
        ldr     x1, =CONSADDR                   /* pa */
@@ -779,6 +780,7 @@
        adr     x6, bootpage_alloc              /* allocator */
        mov     x5, xzr                         /* flags = 0 */
        mov     x4, #LX_BLKPAG_ATTR_DEVICE_MEM|LX_BLKPAG_AP_RW  /* attr */
+       orr     x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
        mov     x3, #L2_SIZE                    /* blocksize */
        mov     x2, #(1024*1024*1024*4)         /* size */
        mov     x1, xzr                         /* pa */