Page MenuHomeFreeBSD
Files F142450397

D1810.id7879.diff
No OneTemporary
Actions

D1810.id7879.diff
View Options

Index: sys/arm/arm/locore-v6.S
===================================================================
--- sys/arm/arm/locore-v6.S
+++ sys/arm/arm/locore-v6.S
@@ -45,12 +45,46 @@
#define PTE1_SIZE L1_S_SIZE
#endif
+#if __ARM_ARCH >= 7
+#if defined(__ARM_ARCH_7VE__) || defined(__clang__)
+/*
+ * HYP support is in bintuils >= 2.21 and gcc >= 4.9 defines __ARM_ARCH_7VE__
+ * when enabled. llvm >= 3.6 supports it too.
+ */
+.arch_extension virt
+#define MSR_ELR_HYP(regnum) msr elr_hyp, lr
+#define ERET eret
+#else
+#define MSR_ELR_HYP(regnum) .word (0xe12ef300 | regnum)
+#define ERET .word 0xe160006e
+#endif
+#endif /* __ARM_ARCH >= 7 */
+
/* A small statically-allocated stack used only during initarm() and AP startup. */
#define INIT_ARM_STACK_SIZE 2048
.text
.align 2
+#define LEAVE_HYP \
+#if __ARM_ARCH >= 7 ;\
+ /* Leave HYP mode */ ;\
+ mrs r0, cpsr ;\
+ and r0, r0, #(PSR_MODE) /* Mode is in the low 5 bits of CPSR */ ;\
+ teq r0, #(PSR_HYP32_MODE) /* Hyp Mode? */ ;\
+ bne 1f ;\
+ /* Ensure that IRQ, FIQ and Aborts will be disabled after eret */;\
+ mrs r0, spsr ;\
+ orr r0, r0, #(PSR_I | PSR_F | PSR_A) ;\
+ msr spsr, r0 ;\
+ /* Exit hypervisor mode */ ;\
+ adr lr, 1f ;\
+ MSR_ELR_HYP(14) ;\
+ ERET ;\
+#endif ;\
+1: ;\
+#endif /* __ARM_ARCH >= 7 */
+
/*
* On entry for FreeBSD boot ABI:
* r0 - metadata pointer or 0 (boothowto on AT91's boot2)
@@ -76,6 +110,8 @@
mov r10, r2 /* Save meta data */
mov r11, r3 /* Future expansion */
+ LEAVE_HYP
+
/*
* Check whether data cache is enabled. If it is, then we know
* current tags are valid (not power-on garbage values) and there
@@ -401,6 +437,8 @@
/* Make sure interrupts are disabled. */
cpsid ifa
+ LEAVE_HYP
+
/* Setup core, disable all caches. */
mrc CP15_SCTLR(r0)
bic r0, #CPU_CONTROL_MMU_ENABLE

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 2:21 AM (14 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27786789
Default Alt Text
D1810.id7879.diff (1 KB)

Event Timeline