Module Name: src
Committed By: ryo
Date: Tue May 26 07:23:57 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
fixed that BTI trap will be occured when AP jumps to mp_vstart on
ARMV85_BTI+SMP evironment.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/aarch64/aarch64/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.60 src/sys/arch/aarch64/aarch64/locore.S:1.61
--- src/sys/arch/aarch64/aarch64/locore.S:1.60 Fri May 15 04:55:40 2020
+++ src/sys/arch/aarch64/aarch64/locore.S Tue May 26 07:23:57 2020
@@ -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 <[email protected]>
@@ -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 @@ ENTRY_NP(cpu_mpstart)
br x20
mp_vstart:
+ hint 0x24 /* bti j */
CPU_DPRINTREG("PC = ", x20)
/* set exception vector */
