[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/543779d9b41a
branches:  netbsd-9
changeset: 963397:543779d9b41a
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 09 16:08:57 2019 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #532):

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

Mark FDT as non-exec and create KVA=VA mapping of same size as identity
mapping, i.e. include BOOTPAGE_ALLOC_MAX

diffstat:

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

diffs (34 lines):

diff -r 1c17afe39c1c -r 543779d9b41a sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Mon Dec 09 16:05:04 2019 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Mon Dec 09 16:08:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.39.2.2 2019/10/23 19:14:19 martin Exp $   */
+/*     $NetBSD: locore.S,v 1.39.2.3 2019/12/09 16:08:57 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.2.2 2019/10/23 19:14:19 martin Exp $")
+RCSID("$NetBSD: locore.S,v 1.39.2.3 2019/12/09 16:08:57 martin Exp $")
 
 
 /*#define DEBUG_LOCORE                 /* debug print */
@@ -819,6 +819,7 @@
        adr     x6, bootpage_alloc              /* allocator */
        mov     x5, xzr                         /* flags = 0 */
        mov     x4, #LX_BLKPAG_ATTR_NORMAL_NC|LX_BLKPAG_AP_RW   /* attr */
+       orr     x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
        mov     x3, #L2_SIZE                    /* blocksize */
        mov     x2, #L2_SIZE                    /* size */
        mov     x1, x8                          /* pa */
@@ -837,6 +838,7 @@
        adr     x1, start                       /* pa = start */
        ADDR    x2, _end
        sub     x2, x2, x1                      /* size = _end - start */
+       add     x2, x2, #BOOTPAGE_ALLOC_MAX     /* for bootpage_alloc() */
        ldr     x0, =start                      /* va */
        bl      pmapboot_enter
        cbnz    x0, init_mmutable_error