summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2020-03-11 13:24:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2020-03-11 13:24:17 +0000
commitd43cb295e2cf9556b8d128ceb44061b823ea5e54 (patch)
treebf77acbbaa397d1d8844439cd74daf959bcee470 /sys/arch/arm
parent02a170df4f9f31380e4ee904936c6e199e49cf57 (diff)
Anthony Steinhauser reports that 32-bit arm cpus have the same speculation
problems as 64-bit models. After every eret, there must be a speculation barrier. ok kettenis
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/arm/locore.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/arm/arm/locore.S b/sys/arch/arm/arm/locore.S
index 0bedacd31e7..8ff3297b6ab 100644
--- a/sys/arch/arm/arm/locore.S
+++ b/sys/arch/arm/arm/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.19 2019/10/27 10:26:12 kettenis Exp $ */
+/* $OpenBSD: locore.S,v 1.20 2020/03/11 13:24:16 deraadt Exp $ */
/* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */
/*
@@ -121,6 +121,8 @@ drop_to_pl1:
msr spsr_fsxc, r0
msr ELR_hyp, lr
eret /* Use the HYP LR to get into SVC */
+ dsb nsh
+ isb
.globl start_mmu
start_mmu: