Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/aarch64 fixed that BTI trap will be occured...



details:   https://anonhg.NetBSD.org/src/rev/395e98a207bf
branches:  trunk
changeset: 933516:395e98a207bf
user:      ryo <ryo%NetBSD.org@localhost>
date:      Tue May 26 07:23:57 2020 +0000

description:
fixed that BTI trap will be occured when AP jumps to mp_vstart on ARMV85_BTI+SMP evironment.

diffstat:

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

diffs (26 lines):

diff -r 9bfcb9294620 -r 395e98a207bf sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Tue May 26 07:03:22 2020 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Tue May 26 07:23:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.60 2020/05/15 04:55:40 ryo Exp $  */
+/*     $NetBSD: locore.S,v 1.61 2020/05/26 07:23:57 ryo 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.60 2020/05/15 04:55:40 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.61 2020/05/26 07:23:57 ryo Exp $")
 
 #ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
 #define        MAIR_DEVICE_MEM         MAIR_DEVICE_nGnRnE
@@ -436,6 +436,7 @@
        br      x20
 
 mp_vstart:
+       hint    0x24            /* bti j */
        CPU_DPRINTREG("PC               = ", x20)
 
        /* set exception vector */



Home | Main Index | Thread Index | Old Index